From 9f201bbeb53c963d80e8917839e48ada971fd868 Mon Sep 17 00:00:00 2001 From: Jonathan Cameron Date: Mon, 18 Apr 2011 12:58:58 +0100 Subject: [PATCH] staging:iio:adis16350 replace unnecessary event line registration. Whilst the adis163500 does indeed support events, currently the driver does not. The trigger code should never use that infrastructure. Signed-off-by: Jonathan Cameron Acked-by: Michael Hennerich Signed-off-by: Greg Kroah-Hartman --- drivers/staging/iio/imu/adis16350_core.c | 26 +--------------- drivers/staging/iio/imu/adis16350_trigger.c | 48 +++++++++++++---------------- 2 files changed, 22 insertions(+), 52 deletions(-) diff --git a/drivers/staging/iio/imu/adis16350_core.c b/drivers/staging/iio/imu/adis16350_core.c index 2081924..741502d 100644 --- a/drivers/staging/iio/imu/adis16350_core.c +++ b/drivers/staging/iio/imu/adis16350_core.c @@ -584,14 +584,6 @@ static const struct attribute_group adis16350_attribute_group = { .attrs = adis16350_attributes, }; -static struct attribute *adis16350_event_attributes[] = { - NULL, -}; - -static struct attribute_group adis16350_event_attribute_group = { - .attrs = adis16350_event_attributes, -}; - static int __devinit adis16350_probe(struct spi_device *spi) { int ret, regdone = 0; @@ -624,8 +616,6 @@ static int __devinit adis16350_probe(struct spi_device *spi) } st->indio_dev->dev.parent = &spi->dev; - st->indio_dev->num_interrupt_lines = 1; - st->indio_dev->event_attrs = &adis16350_event_attribute_group; st->indio_dev->attrs = &adis16350_attribute_group; st->indio_dev->dev_data = (void *)(st); st->indio_dev->driver_module = THIS_MODULE; @@ -647,17 +637,9 @@ static int __devinit adis16350_probe(struct spi_device *spi) } if (spi->irq) { - ret = iio_register_interrupt_line(spi->irq, - st->indio_dev, - 0, - IRQF_TRIGGER_RISING, - "adis16350"); - if (ret) - goto error_uninitialize_ring; - ret = adis16350_probe_trigger(st->indio_dev); if (ret) - goto error_unregister_line; + goto error_uninitialize_ring; } /* Get the device into a sane initial state */ @@ -668,9 +650,6 @@ static int __devinit adis16350_probe(struct spi_device *spi) error_remove_trigger: adis16350_remove_trigger(st->indio_dev); -error_unregister_line: - if (spi->irq) - iio_unregister_interrupt_line(st->indio_dev, 0); error_uninitialize_ring: iio_ring_buffer_unregister(st->indio_dev->ring); error_unreg_ring_funcs: @@ -703,9 +682,6 @@ static int adis16350_remove(struct spi_device *spi) flush_scheduled_work(); adis16350_remove_trigger(indio_dev); - if (spi->irq) - iio_unregister_interrupt_line(indio_dev, 0); - iio_ring_buffer_unregister(indio_dev->ring); iio_device_unregister(indio_dev); adis16350_unconfigure_ring(indio_dev); diff --git a/drivers/staging/iio/imu/adis16350_trigger.c b/drivers/staging/iio/imu/adis16350_trigger.c index 739b7ec..8d35913 100644 --- a/drivers/staging/iio/imu/adis16350_trigger.c +++ b/drivers/staging/iio/imu/adis16350_trigger.c @@ -15,21 +15,13 @@ /** * adis16350_data_rdy_trig_poll() the event handler for the data rdy trig **/ -static int adis16350_data_rdy_trig_poll(struct iio_dev *dev_info, - int index, - s64 timestamp, - int no_test) +static irqreturn_t adis16350_data_rdy_trig_poll(int irq, void *private) { - struct adis16350_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, &adis16350_data_rdy_trig_poll); - static IIO_TRIGGER_NAME_ATTR; static struct attribute *adis16350_trigger_attrs[] = { @@ -49,22 +41,9 @@ static int adis16350_data_rdy_trigger_set_state(struct iio_trigger *trig, { struct adis16350_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 = adis16350_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); - /* possible quirk with handler currently worked around - by ensuring the work queue is empty */ - flush_scheduled_work(); - } else { - iio_add_event_to_list(&iio_event_data_rdy_trig, - &indio_dev->interrupts[0]->ev_list); - } - return ret; + return adis16350_set_irq(&st->indio_dev->dev, state); } /** @@ -85,12 +64,24 @@ int adis16350_probe_trigger(struct iio_dev *indio_dev) struct adis16350_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, + adis16350_data_rdy_trig_poll, + IRQF_TRIGGER_RISING, + "adis16350", + st->trig); + if (ret) + goto error_free_trig; + st->trig->name = kasprintf(GFP_KERNEL, "adis16350-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; @@ -109,9 +100,11 @@ int adis16350_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; } @@ -121,5 +114,6 @@ void adis16350_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); } -- 2.7.4