staging:iio:gyro:adis16260 move to irqchip based trigger handling.

Untested.

Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/iio/gyro/adis16260.h b/drivers/staging/iio/gyro/adis16260.h
index 1369501b40960ce0311370003dc669fbf807a644..5325c681c48b5c12d38684be6415f9d0adb0127a 100644 (file)
--- a/drivers/staging/iio/gyro/adis16260.h
+++ b/drivers/staging/iio/gyro/adis16260.h
@@ -85,9 +85,6 @@
 /**
  * struct adis16260_state - device instance specific data
  * @us:                        actual spi_device
- * @work_trigger_to_ring: bh for triggered event handling
- * @inter:             used to check if new interrupt has been triggered
- * @last_timestamp:    passing timestamp from th to bh of interrupt handler
  * @indio_dev:         industrial I/O device structure
  * @trig:              data ready trigger registered with iio
  * @tx:                        transmit buffer
@@ -97,8 +94,6 @@
  **/
 struct adis16260_state {
        struct spi_device               *us;
-       struct work_struct              work_trigger_to_ring;
-       s64                             last_timestamp;
        struct iio_dev                  *indio_dev;
        struct iio_trigger              *trig;
        u8                              *tx;

diff --git a/drivers/staging/iio/gyro/adis16260_ring.c b/drivers/staging/iio/gyro/adis16260_ring.c
index 23428894b1ee745f74d64bcf4f51e6db98dc381d..2806d838c5316057a6a0d16890029bf5acdb243e 100644 (file)
--- a/drivers/staging/iio/gyro/adis16260_ring.c
+++ b/drivers/staging/iio/gyro/adis16260_ring.c
@@ -58,17 +58,6 @@ static struct attribute_group adis16260_scan_el_group = {
        .name = "scan_elements",
 };
 
-/**
- * adis16260_poll_func_th() top half interrupt handler called by trigger
- * @private_data:      iio_dev
- **/
-static void adis16260_poll_func_th(struct iio_dev *indio_dev, s64 time)
-{
-       struct adis16260_state *st = iio_dev_get_devdata(indio_dev);
-       st->last_timestamp = time;
-       schedule_work(&st->work_trigger_to_ring);
-}
-
 /**
  * adis16260_read_ring_data() read data registers which will be placed into ring
  * @dev: device associated with child of actual device (iio_dev or iio_trig)
@@ -117,14 +106,12 @@ static int adis16260_read_ring_data(struct device *dev, u8 *rx)
        return ret;
 }
 
-
-static void adis16260_trigger_bh_to_ring(struct work_struct *work_s)
+static irqreturn_t adis16260_trigger_handler(int irq, void *p)
 {
-       struct adis16260_state *st
-               = container_of(work_s, struct adis16260_state,
-                               work_trigger_to_ring);
-       struct iio_ring_buffer *ring = st->indio_dev->ring;
-
+       struct iio_poll_func *pf = p;
+       struct iio_dev *indio_dev = pf->private_data;
+       struct adis16260_state *st = iio_dev_get_devdata(indio_dev);
+       struct iio_ring_buffer *ring = indio_dev->ring;
        int i = 0;
        s16 *data;
        size_t datasize = ring->access.get_bytes_per_datum(ring);
@@ -132,31 +119,29 @@ static void adis16260_trigger_bh_to_ring(struct work_struct *work_s)
        data = kmalloc(datasize , GFP_KERNEL);
        if (data == NULL) {
                dev_err(&st->us->dev, "memory alloc failed in ring bh");
-               return;
+               return -ENOMEM;
        }
 
-       if (ring->scan_count)
-               if (adis16260_read_ring_data(&st->indio_dev->dev, st->rx) >= 0)
-                       for (; i < ring->scan_count; i++)
-                               data[i] = be16_to_cpup(
-                                       (__be16 *)&(st->rx[i*2]));
+       if (ring->scan_count &&
+           adis16260_read_ring_data(&st->indio_dev->dev, st->rx) >= 0)
+               for (; i < ring->scan_count; i++)
+                       data[i] = be16_to_cpup((__be16 *)&(st->rx[i*2]));
 
        /* Guaranteed to be aligned with 8 byte boundary */
        if (ring->scan_timestamp)
-               *((s64 *)(data + ((i + 3)/4)*4)) = st->last_timestamp;
+               *((s64 *)(data + ((i + 3)/4)*4)) = pf->timestamp;
 
-       ring->access.store_to(ring,
-                       (u8 *)data,
-                       st->last_timestamp);
+       ring->access.store_to(ring, (u8 *)data, pf->timestamp);
 
        iio_trigger_notify_done(st->indio_dev->trig);
        kfree(data);
 
-       return;
+       return IRQ_HANDLED;
 }
 
 void adis16260_unconfigure_ring(struct iio_dev *indio_dev)
 {
+       kfree(indio_dev->pollfunc->name);
        kfree(indio_dev->pollfunc);
        iio_sw_rb_free(indio_dev->ring);
 }
@@ -164,9 +149,7 @@ void adis16260_unconfigure_ring(struct iio_dev *indio_dev)
 int adis16260_configure_ring(struct iio_dev *indio_dev)
 {
        int ret = 0;
-       struct adis16260_state *st = indio_dev->dev_data;
        struct iio_ring_buffer *ring;
-       INIT_WORK(&st->work_trigger_to_ring, adis16260_trigger_bh_to_ring);
 
        ring = iio_sw_rb_allocate(indio_dev);
        if (!ring) {
@@ -191,13 +174,26 @@ int adis16260_configure_ring(struct iio_dev *indio_dev)
        iio_scan_mask_set(ring, iio_scan_el_temp.number);
        iio_scan_mask_set(ring, iio_scan_el_angl.number);
 
-       ret = iio_alloc_pollfunc(indio_dev, NULL, &adis16260_poll_func_th);
-       if (ret)
+       indio_dev->pollfunc = kzalloc(sizeof(*indio_dev->pollfunc), GFP_KERNEL);
+       if (indio_dev->pollfunc == NULL) {
+               ret = -ENOMEM;
                goto error_iio_sw_rb_free;
+       }
+       indio_dev->pollfunc->private_data = indio_dev;
+       indio_dev->pollfunc->h = &iio_pollfunc_store_time;
+       indio_dev->pollfunc->thread = &adis16260_trigger_handler;
+       indio_dev->pollfunc->type = IRQF_ONESHOT;
+       indio_dev->pollfunc->name =
+               kasprintf(GFP_KERNEL, "adis16260_consumer%d", indio_dev->id);
+       if (indio_dev->pollfunc->name == NULL) {
+               ret = -ENOMEM;
+               goto error_free_pollfunc;
+       }
 
        indio_dev->modes |= INDIO_RING_TRIGGERED;
        return 0;
-
+error_free_pollfunc:
+       kfree(indio_dev->pollfunc);
 error_iio_sw_rb_free:
        iio_sw_rb_free(indio_dev->ring);
        return ret;

diff --git a/drivers/staging/iio/gyro/adis16260_trigger.c b/drivers/staging/iio/gyro/adis16260_trigger.c
index 5eb30381d58ba964ef1511b84581d6fe358b1cff..6b73927a2490c1df28fee285eaf2e7c91ddec504 100644 (file)
--- a/drivers/staging/iio/gyro/adis16260_trigger.c
+++ b/drivers/staging/iio/gyro/adis16260_trigger.c
@@ -12,16 +12,6 @@
 #include "../trigger.h"
 #include "adis16260.h"
 
-/**
- * adis16260_data_rdy_trig_poll() the event handler for the data rdy trig
- **/
-static irqreturn_t adis16260_data_rdy_trig_poll(int irq, void *private)
-{
-       disable_irq_nosync(irq);
-       iio_trigger_poll(private, iio_get_time_ns());
-       return IRQ_HANDLED;
-}
-
 static IIO_TRIGGER_NAME_ATTR;
 
 static struct attribute *adis16260_trigger_attrs[] = {
@@ -46,63 +36,54 @@ static int adis16260_data_rdy_trigger_set_state(struct iio_trigger *trig,
        return adis16260_set_irq(&st->indio_dev->dev, state);
 }
 
-/**
- * adis16260_trig_try_reen() try renabling irq for data rdy trigger
- * @trig:      the datardy trigger
- **/
-static int adis16260_trig_try_reen(struct iio_trigger *trig)
-{
-       struct adis16260_state *st = trig->private_data;
-       enable_irq(st->us->irq);
-       return 0;
-}
-
 int adis16260_probe_trigger(struct iio_dev *indio_dev)
 {
        int ret;
        struct adis16260_state *st = indio_dev->dev_data;
+       char *name;
+       name = kasprintf(GFP_KERNEL,
+                        "%s-dev%d",
+                        spi_get_device_id(st->us)->name,
+                        indio_dev->id);
+       if (name == NULL) {
+               ret = -ENOMEM;
+               goto error_ret;
+       }
 
-       st->trig = iio_allocate_trigger();
+       st->trig = iio_allocate_trigger_named(name);
        if (st->trig == NULL) {
                ret = -ENOMEM;
-               goto error_ret;
+               goto error_free_name;
        }
+
        ret = request_irq(st->us->irq,
-                         adis16260_data_rdy_trig_poll,
+                         &iio_trigger_generic_data_rdy_poll,
                          IRQF_TRIGGER_RISING,
                          "adis16260",
                          st->trig);
        if (ret)
                goto error_free_trig;
 
-       st->trig->name = kasprintf(GFP_KERNEL,
-                                  "adis16260-dev%d",
-                                  indio_dev->id);
-       if (!st->trig->name) {
-               ret = -ENOMEM;
-               goto error_free_irq;
-       }
        st->trig->dev.parent = &st->us->dev;
        st->trig->owner = THIS_MODULE;
        st->trig->private_data = st;
        st->trig->set_trigger_state = &adis16260_data_rdy_trigger_set_state;
-       st->trig->try_reenable = &adis16260_trig_try_reen;
        st->trig->control_attrs = &adis16260_trigger_attr_group;
        ret = iio_trigger_register(st->trig);
 
        /* select default trigger */
        indio_dev->trig = st->trig;
        if (ret)
-               goto error_free_trig_name;
+               goto error_free_irq;
 
        return 0;
 
-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_free_name:
+       kfree(name);
 error_ret:
        return ret;
 }