diff options
| author | Jonathan Cameron | 2010-07-11 17:39:11 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2010-07-22 20:38:28 +0200 |
| commit | 7b2c33b11ef003d83c87a58201ff42313e13eff4 (patch) | |
| tree | 15a38e57525a000767840fe769d2270fe76bda8c /drivers/staging/iio/industrialio-trigger.c | |
| parent | staging: iio: Add iio_triggered_ring postenable and predisable + use in drivers (diff) | |
| download | kernel-qcow2-linux-7b2c33b11ef003d83c87a58201ff42313e13eff4.tar.gz kernel-qcow2-linux-7b2c33b11ef003d83c87a58201ff42313e13eff4.tar.xz kernel-qcow2-linux-7b2c33b11ef003d83c87a58201ff42313e13eff4.zip | |
staging: iio: remove timestamp field from trigger and pass instead through pollfuncs
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/iio/industrialio-trigger.c')
| -rw-r--r-- | drivers/staging/iio/industrialio-trigger.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/staging/iio/industrialio-trigger.c b/drivers/staging/iio/industrialio-trigger.c index 2d8e5b915c3f..57dd9232cf0d 100644 --- a/drivers/staging/iio/industrialio-trigger.c +++ b/drivers/staging/iio/industrialio-trigger.c @@ -172,7 +172,7 @@ struct iio_trigger *iio_trigger_find_by_name(const char *name, size_t len) } EXPORT_SYMBOL(iio_trigger_find_by_name); -void iio_trigger_poll(struct iio_trigger *trig) +void iio_trigger_poll(struct iio_trigger *trig, s64 time) { struct iio_poll_func *pf_cursor; @@ -184,7 +184,8 @@ void iio_trigger_poll(struct iio_trigger *trig) } list_for_each_entry(pf_cursor, &trig->pollfunc_list, list) { if (pf_cursor->poll_func_main) { - pf_cursor->poll_func_main(pf_cursor->private_data); + pf_cursor->poll_func_main(pf_cursor->private_data, + time); trig->use_count++; } } @@ -197,8 +198,7 @@ void iio_trigger_notify_done(struct iio_trigger *trig) if (trig->use_count == 0 && trig->try_reenable) if (trig->try_reenable(trig)) { /* Missed and interrupt so launch new poll now */ - trig->timestamp = 0; - iio_trigger_poll(trig); + iio_trigger_poll(trig, 0); } } EXPORT_SYMBOL(iio_trigger_notify_done); @@ -400,7 +400,7 @@ EXPORT_SYMBOL(iio_device_unregister_trigger_consumer); int iio_alloc_pollfunc(struct iio_dev *indio_dev, void (*immediate)(struct iio_dev *indio_dev), - void (*main)(struct iio_dev *private_data)) + void (*main)(struct iio_dev *private_data, s64 time)) { indio_dev->pollfunc = kzalloc(sizeof(*indio_dev->pollfunc), GFP_KERNEL); if (indio_dev->pollfunc == NULL) |