staging:iio:triggers. Add a reference get to the core for triggers.

[pandora-kernel.git] / drivers / staging / iio / industrialio-trigger.c

diff --git a/drivers/staging/iio/industrialio-trigger.c b/drivers/staging/iio/industrialio-trigger.c
index 90ca2df..89a9934 100644 (file)
--- a/drivers/staging/iio/industrialio-trigger.c
+++ b/drivers/staging/iio/industrialio-trigger.c
@@ -8,7 +8,6 @@
  */
 
 #include <linux/kernel.h>
-#include <linux/module.h>
 #include <linux/idr.h>
 #include <linux/err.h>
 #include <linux/device.h>
@@ -18,6 +17,7 @@
 
 #include "iio.h"
 #include "trigger.h"
+#include "iio_core.h"
 #include "trigger_consumer.h"
 
 /* RFC - Question of approach
@@ -206,8 +206,8 @@ EXPORT_SYMBOL(iio_trigger_poll_chained);
 void iio_trigger_notify_done(struct iio_trigger *trig)
 {
        trig->use_count--;
-       if (trig->use_count == 0 && trig->try_reenable)
-               if (trig->try_reenable(trig)) {
+       if (trig->use_count == 0 && trig->ops && trig->ops->try_reenable)
+               if (trig->ops->try_reenable(trig)) {
                        /* Missed and interrupt so launch new poll now */
                        iio_trigger_poll(trig, 0);
                }
@@ -234,8 +234,8 @@ int iio_trigger_attach_poll_func(struct iio_trigger *trig,
        ret = request_threaded_irq(pf->irq, pf->h, pf->thread,
                                   pf->type, pf->name,
                                   pf);
-       if (trig->set_trigger_state && notinuse)
-               ret = trig->set_trigger_state(trig, true);
+       if (trig->ops && trig->ops->set_trigger_state && notinuse)
+               ret = trig->ops->set_trigger_state(trig, true);
 
        return ret;
 }
@@ -249,8 +249,8 @@ int iio_trigger_dettach_poll_func(struct iio_trigger *trig,
                = (bitmap_weight(trig->pool,
                                 CONFIG_IIO_CONSUMERS_PER_TRIGGER)
                   == 1);
-       if (trig->set_trigger_state && no_other_users) {
-               ret = trig->set_trigger_state(trig, false);
+       if (trig->ops && trig->ops->set_trigger_state && no_other_users) {
+               ret = trig->ops->set_trigger_state(trig, false);
                if (ret)
                        goto error_ret;
        }
@@ -358,8 +358,8 @@ static ssize_t iio_trigger_write_current(struct device *dev,
                        return ret;
        }
 
-       if (trig && trig->validate_device) {
-               ret = trig->validate_device(trig, dev_info);
+       if (trig && trig->ops && trig->ops->validate_device) {
+               ret = trig->ops->validate_device(trig, dev_info);
                if (ret)
                        return ret;
        }
@@ -477,6 +477,7 @@ struct iio_trigger *iio_allocate_trigger(const char *fmt, ...)
                                          IRQ_NOPROBE);
                }
                iio_get();
+               get_device(&trig->dev);
        }
        return trig;
 }
@@ -500,6 +501,9 @@ EXPORT_SYMBOL(iio_device_register_trigger_consumer);
 
 int iio_device_unregister_trigger_consumer(struct iio_dev *dev_info)
 {
+       /* Clean up and associated but not attached triggers references */
+       if (dev_info->trig)
+               iio_put_trigger(dev_info->trig);
        sysfs_remove_group(&dev_info->dev.kobj,
                           &iio_trigger_consumer_attr_group);
        return 0;