Patched in Tegra support.

1 files changed, 14 insertions, 13 deletions

diff --git a/drivers/staging/iio/imu/adis16400_trigger.c b/drivers/staging/iio/imu/adis16400_trigger.c
index 42a678e92fc..c6ec41a02a6 100644
--- a/drivers/staging/iio/imu/adis16400_trigger.c
+++ b/drivers/staging/iio/imu/adis16400_trigger.c
@@ -1,10 +1,15 @@
 #include <linux/interrupt.h>
+#include <linux/irq.h>
+#include <linux/mutex.h>
+#include <linux/device.h>
 #include <linux/kernel.h>
+#include <linux/sysfs.h>
+#include <linux/list.h>
 #include <linux/spi/spi.h>
-#include <linux/export.h>
 
-#include <linux/iio/iio.h>
-#include <linux/iio/trigger.h>
+#include "../iio.h"
+#include "../sysfs.h"
+#include "../trigger.h"
 #include "adis16400.h"
 
 /**
@@ -19,18 +24,13 @@ static int adis16400_data_rdy_trigger_set_state(struct iio_trigger *trig,
         return adis16400_set_irq(indio_dev, state);
 }
 
-static const struct iio_trigger_ops adis16400_trigger_ops = {
-        .owner = THIS_MODULE,
-        .set_trigger_state = &adis16400_data_rdy_trigger_set_state,
-};
-
 int adis16400_probe_trigger(struct iio_dev *indio_dev)
 {
         int ret;
         struct adis16400_state *st = iio_priv(indio_dev);
 
-        st->trig = iio_trigger_alloc("%s-dev%d",
-                                        indio_dev->name,
+        st->trig = iio_allocate_trigger("%s-dev%d",
+                                        spi_get_device_id(st->us)->name,
                                         indio_dev->id);
         if (st->trig == NULL) {
                 ret = -ENOMEM;
@@ -45,8 +45,9 @@ int adis16400_probe_trigger(struct iio_dev *indio_dev)
         if (ret)
                 goto error_free_trig;
         st->trig->dev.parent = &st->us->dev;
+        st->trig->owner = THIS_MODULE;
         st->trig->private_data = indio_dev;
-        st->trig->ops = &adis16400_trigger_ops;
+        st->trig->set_trigger_state = &adis16400_data_rdy_trigger_set_state;
         ret = iio_trigger_register(st->trig);
 
         /* select default trigger */
@@ -59,7 +60,7 @@ int adis16400_probe_trigger(struct iio_dev *indio_dev)
 error_free_irq:
         free_irq(st->us->irq, st->trig);
 error_free_trig:
-        iio_trigger_free(st->trig);
+        iio_free_trigger(st->trig);
 error_ret:
         return ret;
 }
@@ -70,5 +71,5 @@ void adis16400_remove_trigger(struct iio_dev *indio_dev)
 
         iio_trigger_unregister(st->trig);
         free_irq(st->us->irq, st->trig);
-        iio_trigger_free(st->trig);
+        iio_free_trigger(st->trig);
 }