From dcc3b861fcf7b412bee342263b0e20c0deee0752 Mon Sep 17 00:00:00 2001 From: Jonathan Cameron Date: Wed, 26 Oct 2011 17:27:38 +0100 Subject: [PATCH] --- yaml --- r: 280991 b: refs/heads/master c: 67be8e32c9f98453faeb9a992a47bd5910c9fb2e h: refs/heads/master i: 280989: 6110d80b43a21c9655c0b2831446da6d6b742a4d 280987: e65caac5ffb544458d57de6c9c9b60c5821e5912 280983: feb971e2bb2fc5e6bf923886b5da2c6421dc8824 280975: 24cfe6e413a611530a97918623e1ead696a8e038 280959: b415ecba1084ab751dcfcd9beaf894db52a7ba27 v: v3 --- [refs] | 2 +- trunk/drivers/staging/iio/iio_core_trigger.h | 3 +-- trunk/drivers/staging/iio/industrialio-trigger.c | 16 +++++----------- 3 files changed, 7 insertions(+), 14 deletions(-) diff --git a/[refs] b/[refs] index 9c76a75a9ebb..93a3a2e8f5a0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 22dc09cafda0d9b31e8f07539535582fb343baf8 +refs/heads/master: 67be8e32c9f98453faeb9a992a47bd5910c9fb2e diff --git a/trunk/drivers/staging/iio/iio_core_trigger.h b/trunk/drivers/staging/iio/iio_core_trigger.h index 523c288b776b..6f7c56fcbe78 100644 --- a/trunk/drivers/staging/iio/iio_core_trigger.h +++ b/trunk/drivers/staging/iio/iio_core_trigger.h @@ -13,8 +13,7 @@ * iio_device_register_trigger_consumer() - set up an iio_dev to use triggers * @indio_dev: iio_dev associated with the device that will consume the trigger **/ - -int iio_device_register_trigger_consumer(struct iio_dev *indio_dev); +void iio_device_register_trigger_consumer(struct iio_dev *indio_dev); /** * iio_device_unregister_trigger_consumer() - reverse the registration process diff --git a/trunk/drivers/staging/iio/industrialio-trigger.c b/trunk/drivers/staging/iio/industrialio-trigger.c index 2c626e0cb29c..ca4124aa65ee 100644 --- a/trunk/drivers/staging/iio/industrialio-trigger.c +++ b/trunk/drivers/staging/iio/industrialio-trigger.c @@ -473,12 +473,10 @@ void iio_free_trigger(struct iio_trigger *trig) } EXPORT_SYMBOL(iio_free_trigger); -int iio_device_register_trigger_consumer(struct iio_dev *indio_dev) +void iio_device_register_trigger_consumer(struct iio_dev *indio_dev) { indio_dev->groups[indio_dev->groupcounter++] = &iio_trigger_consumer_attr_group; - - return 0; } void iio_device_unregister_trigger_consumer(struct iio_dev *indio_dev) @@ -490,18 +488,14 @@ void iio_device_unregister_trigger_consumer(struct iio_dev *indio_dev) int iio_triggered_buffer_postenable(struct iio_dev *indio_dev) { - return indio_dev->trig - ? iio_trigger_attach_poll_func(indio_dev->trig, - indio_dev->pollfunc) - : 0; + return iio_trigger_attach_poll_func(indio_dev->trig, + indio_dev->pollfunc); } EXPORT_SYMBOL(iio_triggered_buffer_postenable); int iio_triggered_buffer_predisable(struct iio_dev *indio_dev) { - return indio_dev->trig - ? iio_trigger_dettach_poll_func(indio_dev->trig, - indio_dev->pollfunc) - : 0; + return iio_trigger_dettach_poll_func(indio_dev->trig, + indio_dev->pollfunc); } EXPORT_SYMBOL(iio_triggered_buffer_predisable);