staging:iio:adis16300 replace unnecessary event line registration.

Whilst the adis16300 does indeed support events, currently the driver
does not.  The trigger code should never use that infrastructure.

Tested indirectly via the IMU driver merge to follow.

Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Acked-by: Michael Hennerich <michael.hennerich@analog.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/iio/imu/adis16300_core.c b/drivers/staging/iio/imu/adis16300_core.c
index 0734d4a..903bb30 100644 (file)
--- a/drivers/staging/iio/imu/adis16300_core.c
+++ b/drivers/staging/iio/imu/adis16300_core.c
@@ -563,14 +563,6 @@ static IIO_CONST_ATTR_SAMP_FREQ_AVAIL("409 546 819 1638");
 
 static IIO_CONST_ATTR_NAME("adis16300");
 
-static struct attribute *adis16300_event_attributes[] = {
-       NULL
-};
-
-static struct attribute_group adis16300_event_attribute_group = {
-       .attrs = adis16300_event_attributes,
-};
-
 static struct attribute *adis16300_attributes[] = {
        &iio_dev_attr_gyro_x_calibbias.dev_attr.attr,
        &iio_dev_attr_accel_x_calibbias.dev_attr.attr,
@@ -635,8 +627,6 @@ static int __devinit adis16300_probe(struct spi_device *spi)
        }
 
        st->indio_dev->dev.parent = &spi->dev;
-       st->indio_dev->num_interrupt_lines = 1;
-       st->indio_dev->event_attrs = &adis16300_event_attribute_group;
        st->indio_dev->attrs = &adis16300_attribute_group;
        st->indio_dev->dev_data = (void *)(st);
        st->indio_dev->driver_module = THIS_MODULE;
@@ -658,17 +648,9 @@ static int __devinit adis16300_probe(struct spi_device *spi)
        }
 
        if (spi->irq) {
-               ret = iio_register_interrupt_line(spi->irq,
-                               st->indio_dev,
-                               0,
-                               IRQF_TRIGGER_RISING,
-                               "adis16300");
-               if (ret)
-                       goto error_uninitialize_ring;
-
                ret = adis16300_probe_trigger(st->indio_dev);
                if (ret)
-                       goto error_unregister_line;
+                       goto error_uninitialize_ring;
        }
 
        /* Get the device into a sane initial state */
@@ -679,9 +661,6 @@ static int __devinit adis16300_probe(struct spi_device *spi)
 
 error_remove_trigger:
        adis16300_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:
@@ -714,9 +693,6 @@ static int adis16300_remove(struct spi_device *spi)
        flush_scheduled_work();
 
        adis16300_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);
        adis16300_unconfigure_ring(indio_dev);

diff --git a/drivers/staging/iio/imu/adis16300_trigger.c b/drivers/staging/iio/imu/adis16300_trigger.c
index d6677b6..fd7656f 100644 (file)
--- a/drivers/staging/iio/imu/adis16300_trigger.c
+++ b/drivers/staging/iio/imu/adis16300_trigger.c
@@ -15,21 +15,13 @@
 /**
  * adis16300_data_rdy_trig_poll() the event handler for the data rdy trig
  **/
-static int adis16300_data_rdy_trig_poll(struct iio_dev *dev_info,
-                                      int index,
-                                      s64 timestamp,
-                                      int no_test)
+static irqreturn_t adis16300_data_rdy_trig_poll(int irq, void *private)
 {
-       struct adis16300_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, &adis16300_data_rdy_trig_poll);
-
 static IIO_TRIGGER_NAME_ATTR;
 
 static struct attribute *adis16300_trigger_attrs[] = {
@@ -49,22 +41,9 @@ static int adis16300_data_rdy_trigger_set_state(struct iio_trigger *trig,
 {
        struct adis16300_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 = adis16300_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 adis16300_set_irq(&st->indio_dev->dev, state);
 }
 
 /**
@@ -85,12 +64,24 @@ int adis16300_probe_trigger(struct iio_dev *indio_dev)
        struct adis16300_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,
+                         adis16300_data_rdy_trig_poll,
+                         IRQF_TRIGGER_RISING,
+                         "adis16300",
+                         st->trig);
+       if (ret)
+               goto error_free_trig;
+
        st->trig->name = kasprintf(GFP_KERNEL,
                                   "adis16300-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 adis16300_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 adis16300_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);
 }