Commit 80782446 authored by Jonathan Cameron's avatar Jonathan Cameron Committed by Greg Kroah-Hartman

staging:iio:adis16201 replace unnecessary event line registration.

Untested but identical in form to those that have been.
Signed-off-by: default avatarJonathan Cameron <jic23@cam.ac.uk>
Acked-by: default avatarMichael Hennerich <michael.hennerich@analog.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 37f9d271
No related merge requests found
......@@ -479,14 +479,6 @@ static IIO_DEVICE_ATTR(reset, S_IWUSR, NULL, adis16201_write_reset, 0);
static IIO_CONST_ATTR(name, "adis16201");
static struct attribute *adis16201_event_attributes[] = {
NULL
};
static struct attribute_group adis16201_event_attribute_group = {
.attrs = adis16201_event_attributes,
};
static struct attribute *adis16201_attributes[] = {
&iio_dev_attr_in0_supply_raw.dev_attr.attr,
&iio_const_attr_in0_supply_scale.dev_attr.attr,
......@@ -546,8 +538,6 @@ static int __devinit adis16201_probe(struct spi_device *spi)
}
st->indio_dev->dev.parent = &spi->dev;
st->indio_dev->num_interrupt_lines = 1;
st->indio_dev->event_attrs = &adis16201_event_attribute_group;
st->indio_dev->attrs = &adis16201_attribute_group;
st->indio_dev->dev_data = (void *)(st);
st->indio_dev->driver_module = THIS_MODULE;
......@@ -569,17 +559,9 @@ static int __devinit adis16201_probe(struct spi_device *spi)
}
if (spi->irq) {
ret = iio_register_interrupt_line(spi->irq,
st->indio_dev,
0,
IRQF_TRIGGER_RISING,
"adis16201");
if (ret)
goto error_uninitialize_ring;
ret = adis16201_probe_trigger(st->indio_dev);
if (ret)
goto error_unregister_line;
goto error_uninitialize_ring;
}
/* Get the device into a sane initial state */
......@@ -590,9 +572,6 @@ static int __devinit adis16201_probe(struct spi_device *spi)
error_remove_trigger:
adis16201_remove_trigger(st->indio_dev);
error_unregister_line:
if (spi->irq)
iio_unregister_interrupt_line(st->indio_dev, 0);
error_uninitialize_ring:
adis16201_uninitialize_ring(st->indio_dev->ring);
error_unreg_ring_funcs:
......@@ -620,9 +599,6 @@ static int adis16201_remove(struct spi_device *spi)
flush_scheduled_work();
adis16201_remove_trigger(indio_dev);
if (spi->irq)
iio_unregister_interrupt_line(indio_dev, 0);
adis16201_uninitialize_ring(indio_dev->ring);
iio_device_unregister(indio_dev);
adis16201_unconfigure_ring(indio_dev);
......
......@@ -15,21 +15,13 @@
/**
* adis16201_data_rdy_trig_poll() the event handler for the data rdy trig
**/
static int adis16201_data_rdy_trig_poll(struct iio_dev *dev_info,
int index,
s64 timestamp,
int no_test)
static irqreturn_t adis16201_data_rdy_trig_poll(int irq, void *private)
{
struct adis16201_state *st = iio_dev_get_devdata(dev_info);
struct iio_trigger *trig = st->trig;
iio_trigger_poll(trig, timestamp);
disable_irq_nosync(irq);
iio_trigger_poll(private, iio_get_time_ns());
return IRQ_HANDLED;
}
IIO_EVENT_SH(data_rdy_trig, &adis16201_data_rdy_trig_poll);
static DEVICE_ATTR(name, S_IRUGO, iio_trigger_read_name, NULL);
static struct attribute *adis16201_trigger_attrs[] = {
......@@ -49,20 +41,9 @@ static int adis16201_data_rdy_trigger_set_state(struct iio_trigger *trig,
{
struct adis16201_state *st = trig->private_data;
struct iio_dev *indio_dev = st->indio_dev;
int ret = 0;
dev_dbg(&indio_dev->dev, "%s (%d)\n", __func__, state);
ret = adis16201_set_irq(&st->indio_dev->dev, state);
if (state == false) {
iio_remove_event_from_list(&iio_event_data_rdy_trig,
&indio_dev->interrupts[0]
->ev_list);
flush_scheduled_work();
} else {
iio_add_event_to_list(&iio_event_data_rdy_trig,
&indio_dev->interrupts[0]->ev_list);
}
return ret;
return adis16201_set_irq(&st->indio_dev->dev, state);
}
/**
......@@ -82,12 +63,23 @@ int adis16201_probe_trigger(struct iio_dev *indio_dev)
struct adis16201_state *st = indio_dev->dev_data;
st->trig = iio_allocate_trigger();
if (st->trig == NULL) {
ret = -ENOMEM;
goto error_ret;
}
ret = request_irq(st->us->irq,
adis16201_data_rdy_trig_poll,
IRQF_TRIGGER_RISING,
"adis16201",
st->trig);
if (ret)
goto error_free_trig;
st->trig->name = kasprintf(GFP_KERNEL,
"adis16201-dev%d",
indio_dev->id);
if (!st->trig->name) {
ret = -ENOMEM;
goto error_free_trig;
goto error_free_irq;
}
st->trig->dev.parent = &st->us->dev;
st->trig->owner = THIS_MODULE;
......@@ -106,9 +98,11 @@ int adis16201_probe_trigger(struct iio_dev *indio_dev)
error_free_trig_name:
kfree(st->trig->name);
error_free_irq:
free_irq(st->us->irq, st->trig);
error_free_trig:
iio_free_trigger(st->trig);
error_ret:
return ret;
}
......@@ -118,5 +112,6 @@ void adis16201_remove_trigger(struct iio_dev *indio_dev)
iio_trigger_unregister(state->trig);
kfree(state->trig->name);
free_irq(state->us->irq, state->trig);
iio_free_trigger(state->trig);
}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment