diff options
| -rw-r--r-- | drivers/staging/iio/accel/adis16204_core.c | 26 | ||||
| -rw-r--r-- | drivers/staging/iio/accel/adis16204_trigger.c | 46 |
2 files changed, 22 insertions, 50 deletions
diff --git a/drivers/staging/iio/accel/adis16204_core.c b/drivers/staging/iio/accel/adis16204_core.c index 97376aa2fc54..fe44b25255a5 100644 --- a/drivers/staging/iio/accel/adis16204_core.c +++ b/drivers/staging/iio/accel/adis16204_core.c @@ -432,14 +432,6 @@ static IIO_DEVICE_ATTR(reset, S_IWUSR, NULL, adis16204_write_reset, 0); static IIO_CONST_ATTR(name, "adis16204"); -static struct attribute *adis16204_event_attributes[] = { - NULL -}; - -static struct attribute_group adis16204_event_attribute_group = { - .attrs = adis16204_event_attributes, -}; - static struct attribute *adis16204_attributes[] = { &iio_dev_attr_in0_supply_raw.dev_attr.attr, &iio_const_attr_in0_supply_scale.dev_attr.attr, @@ -500,8 +492,6 @@ static int __devinit adis16204_probe(struct spi_device *spi) } st->indio_dev->dev.parent = &spi->dev; - st->indio_dev->num_interrupt_lines = 1; - st->indio_dev->event_attrs = &adis16204_event_attribute_group; st->indio_dev->attrs = &adis16204_attribute_group; st->indio_dev->dev_data = (void *)(st); st->indio_dev->driver_module = THIS_MODULE; @@ -523,17 +513,9 @@ static int __devinit adis16204_probe(struct spi_device *spi) } if (spi->irq) { - ret = iio_register_interrupt_line(spi->irq, - st->indio_dev, - 0, - IRQF_TRIGGER_RISING, - "adis16204"); - if (ret) - goto error_uninitialize_ring; - ret = adis16204_probe_trigger(st->indio_dev); if (ret) - goto error_unregister_line; + goto error_uninitialize_ring; } /* Get the device into a sane initial state */ @@ -544,9 +526,6 @@ static int __devinit adis16204_probe(struct spi_device *spi) error_remove_trigger: adis16204_remove_trigger(st->indio_dev); -error_unregister_line: - if (spi->irq) - iio_unregister_interrupt_line(st->indio_dev, 0); error_uninitialize_ring: adis16204_uninitialize_ring(st->indio_dev->ring); error_unreg_ring_funcs: @@ -574,9 +553,6 @@ static int adis16204_remove(struct spi_device *spi) flush_scheduled_work(); adis16204_remove_trigger(indio_dev); - if (spi->irq) - iio_unregister_interrupt_line(indio_dev, 0); - adis16204_uninitialize_ring(indio_dev->ring); iio_device_unregister(indio_dev); adis16204_unconfigure_ring(indio_dev); diff --git a/drivers/staging/iio/accel/adis16204_trigger.c b/drivers/staging/iio/accel/adis16204_trigger.c index 8e9db90e51eb..85c648765f2c 100644 --- a/drivers/staging/iio/accel/adis16204_trigger.c +++ b/drivers/staging/iio/accel/adis16204_trigger.c @@ -15,21 +15,13 @@ /** * adis16204_data_rdy_trig_poll() the event handler for the data rdy trig **/ -static int adis16204_data_rdy_trig_poll(struct iio_dev *dev_info, - int index, - s64 timestamp, - int no_test) +static irqreturn_t adis16204_data_rdy_trig_poll(int irq, void *private) { - struct adis16204_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, &adis16204_data_rdy_trig_poll); - static DEVICE_ATTR(name, S_IRUGO, iio_trigger_read_name, NULL); static struct attribute *adis16204_trigger_attrs[] = { @@ -49,20 +41,9 @@ static int adis16204_data_rdy_trigger_set_state(struct iio_trigger *trig, { struct adis16204_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 = adis16204_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 adis16204_set_irq(&st->indio_dev->dev, state); } /** @@ -82,12 +63,24 @@ int adis16204_probe_trigger(struct iio_dev *indio_dev) struct adis16204_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, + adis16204_data_rdy_trig_poll, + IRQF_TRIGGER_RISING, + "adis16204", + st->trig); + if (ret) + goto error_free_trig; + st->trig->name = kasprintf(GFP_KERNEL, "adis16204-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 +99,11 @@ int adis16204_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 +113,6 @@ void adis16204_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); } |