From 3b99fb7656a73d483b00fd4777646c00db16b040 Mon Sep 17 00:00:00 2001 From: Jonathan Cameron Date: Wed, 21 Sep 2011 11:15:53 +0100 Subject: [PATCH] staging:iio: treewide rename iio_triggered_ring_* to iio_triggered_buffer_* Not always a ring so naming is missleading. Also, kfifo_buf is probably first buffer to take out of staging and it definitely isn't a ring. Signed-off-by: Jonathan Cameron Signed-off-by: Greg Kroah-Hartman --- drivers/staging/iio/accel/adis16201_ring.c | 4 ++-- drivers/staging/iio/accel/adis16203_ring.c | 4 ++-- drivers/staging/iio/accel/adis16204_ring.c | 4 ++-- drivers/staging/iio/accel/adis16209_ring.c | 4 ++-- drivers/staging/iio/accel/adis16240_ring.c | 4 ++-- drivers/staging/iio/accel/lis3l02dq_ring.c | 4 ++-- drivers/staging/iio/adc/ad7192.c | 4 ++-- drivers/staging/iio/adc/ad7298_ring.c | 4 ++-- drivers/staging/iio/adc/ad7476_ring.c | 4 ++-- drivers/staging/iio/adc/ad7606_ring.c | 4 ++-- drivers/staging/iio/adc/ad7793.c | 4 ++-- drivers/staging/iio/adc/ad7887_ring.c | 4 ++-- drivers/staging/iio/adc/ad799x_ring.c | 4 ++-- drivers/staging/iio/adc/max1363_ring.c | 4 ++-- drivers/staging/iio/gyro/adis16260_ring.c | 4 ++-- drivers/staging/iio/imu/adis16400_ring.c | 4 ++-- drivers/staging/iio/industrialio-trigger.c | 8 ++++---- drivers/staging/iio/meter/ade7758_ring.c | 4 ++-- drivers/staging/iio/trigger_consumer.h | 4 ++-- 19 files changed, 40 insertions(+), 40 deletions(-) diff --git a/drivers/staging/iio/accel/adis16201_ring.c b/drivers/staging/iio/accel/adis16201_ring.c index 1c1f35d77c34..47be20afbebd 100644 --- a/drivers/staging/iio/accel/adis16201_ring.c +++ b/drivers/staging/iio/accel/adis16201_ring.c @@ -99,8 +99,8 @@ void adis16201_unconfigure_ring(struct iio_dev *indio_dev) static const struct iio_ring_setup_ops adis16201_ring_setup_ops = { .preenable = &iio_sw_ring_preenable, - .postenable = &iio_triggered_ring_postenable, - .predisable = &iio_triggered_ring_predisable, + .postenable = &iio_triggered_buffer_postenable, + .predisable = &iio_triggered_buffer_predisable, }; int adis16201_configure_ring(struct iio_dev *indio_dev) diff --git a/drivers/staging/iio/accel/adis16203_ring.c b/drivers/staging/iio/accel/adis16203_ring.c index d7d692c17b4c..d86f86dc8fdc 100644 --- a/drivers/staging/iio/accel/adis16203_ring.c +++ b/drivers/staging/iio/accel/adis16203_ring.c @@ -101,8 +101,8 @@ void adis16203_unconfigure_ring(struct iio_dev *indio_dev) static const struct iio_ring_setup_ops adis16203_ring_setup_ops = { .preenable = &iio_sw_ring_preenable, - .postenable = &iio_triggered_ring_postenable, - .predisable = &iio_triggered_ring_predisable, + .postenable = &iio_triggered_buffer_postenable, + .predisable = &iio_triggered_buffer_predisable, }; int adis16203_configure_ring(struct iio_dev *indio_dev) diff --git a/drivers/staging/iio/accel/adis16204_ring.c b/drivers/staging/iio/accel/adis16204_ring.c index 273293aa2006..8cc14990531e 100644 --- a/drivers/staging/iio/accel/adis16204_ring.c +++ b/drivers/staging/iio/accel/adis16204_ring.c @@ -96,8 +96,8 @@ void adis16204_unconfigure_ring(struct iio_dev *indio_dev) static const struct iio_ring_setup_ops adis16204_ring_setup_ops = { .preenable = &iio_sw_ring_preenable, - .postenable = &iio_triggered_ring_postenable, - .predisable = &iio_triggered_ring_predisable, + .postenable = &iio_triggered_buffer_postenable, + .predisable = &iio_triggered_buffer_predisable, }; int adis16204_configure_ring(struct iio_dev *indio_dev) diff --git a/drivers/staging/iio/accel/adis16209_ring.c b/drivers/staging/iio/accel/adis16209_ring.c index bc654e2e477b..941fc5acbfdb 100644 --- a/drivers/staging/iio/accel/adis16209_ring.c +++ b/drivers/staging/iio/accel/adis16209_ring.c @@ -96,8 +96,8 @@ void adis16209_unconfigure_ring(struct iio_dev *indio_dev) static const struct iio_ring_setup_ops adis16209_ring_setup_ops = { .preenable = &iio_sw_ring_preenable, - .postenable = &iio_triggered_ring_postenable, - .predisable = &iio_triggered_ring_predisable, + .postenable = &iio_triggered_buffer_postenable, + .predisable = &iio_triggered_buffer_predisable, }; int adis16209_configure_ring(struct iio_dev *indio_dev) diff --git a/drivers/staging/iio/accel/adis16240_ring.c b/drivers/staging/iio/accel/adis16240_ring.c index b41e24f02a9a..e52ad2e36553 100644 --- a/drivers/staging/iio/accel/adis16240_ring.c +++ b/drivers/staging/iio/accel/adis16240_ring.c @@ -93,8 +93,8 @@ void adis16240_unconfigure_ring(struct iio_dev *indio_dev) static const struct iio_ring_setup_ops adis16240_ring_setup_ops = { .preenable = &iio_sw_ring_preenable, - .postenable = &iio_triggered_ring_postenable, - .predisable = &iio_triggered_ring_predisable, + .postenable = &iio_triggered_buffer_postenable, + .predisable = &iio_triggered_buffer_predisable, }; int adis16240_configure_ring(struct iio_dev *indio_dev) diff --git a/drivers/staging/iio/accel/lis3l02dq_ring.c b/drivers/staging/iio/accel/lis3l02dq_ring.c index c8169338b276..eaecda4d6589 100644 --- a/drivers/staging/iio/accel/lis3l02dq_ring.c +++ b/drivers/staging/iio/accel/lis3l02dq_ring.c @@ -386,7 +386,7 @@ static int lis3l02dq_ring_postenable(struct iio_dev *indio_dev) if (ret) goto error_ret; - return iio_triggered_ring_postenable(indio_dev); + return iio_triggered_buffer_postenable(indio_dev); error_ret: return ret; } @@ -397,7 +397,7 @@ static int lis3l02dq_ring_predisable(struct iio_dev *indio_dev) u8 t; int ret; - ret = iio_triggered_ring_predisable(indio_dev); + ret = iio_triggered_buffer_predisable(indio_dev); if (ret) goto error_ret; diff --git a/drivers/staging/iio/adc/ad7192.c b/drivers/staging/iio/adc/ad7192.c index 5a389b81cbc8..3f4e911c4588 100644 --- a/drivers/staging/iio/adc/ad7192.c +++ b/drivers/staging/iio/adc/ad7192.c @@ -564,8 +564,8 @@ static irqreturn_t ad7192_trigger_handler(int irq, void *p) static const struct iio_ring_setup_ops ad7192_ring_setup_ops = { .preenable = &ad7192_ring_preenable, - .postenable = &iio_triggered_ring_postenable, - .predisable = &iio_triggered_ring_predisable, + .postenable = &iio_triggered_buffer_postenable, + .predisable = &iio_triggered_buffer_predisable, .postdisable = &ad7192_ring_postdisable, }; diff --git a/drivers/staging/iio/adc/ad7298_ring.c b/drivers/staging/iio/adc/ad7298_ring.c index 246b2e724d38..9c5ac9dd5efa 100644 --- a/drivers/staging/iio/adc/ad7298_ring.c +++ b/drivers/staging/iio/adc/ad7298_ring.c @@ -145,8 +145,8 @@ static irqreturn_t ad7298_trigger_handler(int irq, void *p) static const struct iio_ring_setup_ops ad7298_ring_setup_ops = { .preenable = &ad7298_ring_preenable, - .postenable = &iio_triggered_ring_postenable, - .predisable = &iio_triggered_ring_predisable, + .postenable = &iio_triggered_buffer_postenable, + .predisable = &iio_triggered_buffer_predisable, }; int ad7298_register_ring_funcs_and_init(struct iio_dev *indio_dev) diff --git a/drivers/staging/iio/adc/ad7476_ring.c b/drivers/staging/iio/adc/ad7476_ring.c index b109afb89846..3cc673c9e5c7 100644 --- a/drivers/staging/iio/adc/ad7476_ring.c +++ b/drivers/staging/iio/adc/ad7476_ring.c @@ -107,8 +107,8 @@ done: static const struct iio_ring_setup_ops ad7476_ring_setup_ops = { .preenable = &ad7476_ring_preenable, - .postenable = &iio_triggered_ring_postenable, - .predisable = &iio_triggered_ring_predisable, + .postenable = &iio_triggered_buffer_postenable, + .predisable = &iio_triggered_buffer_predisable, }; int ad7476_register_ring_funcs_and_init(struct iio_dev *indio_dev) diff --git a/drivers/staging/iio/adc/ad7606_ring.c b/drivers/staging/iio/adc/ad7606_ring.c index e6424300c8e7..320ec68a4a38 100644 --- a/drivers/staging/iio/adc/ad7606_ring.c +++ b/drivers/staging/iio/adc/ad7606_ring.c @@ -149,8 +149,8 @@ done: static const struct iio_ring_setup_ops ad7606_ring_setup_ops = { .preenable = &ad7606_ring_preenable, - .postenable = &iio_triggered_ring_postenable, - .predisable = &iio_triggered_ring_predisable, + .postenable = &iio_triggered_buffer_postenable, + .predisable = &iio_triggered_buffer_predisable, }; int ad7606_register_ring_funcs_and_init(struct iio_dev *indio_dev) diff --git a/drivers/staging/iio/adc/ad7793.c b/drivers/staging/iio/adc/ad7793.c index 7044ed2932a7..565199d0a939 100644 --- a/drivers/staging/iio/adc/ad7793.c +++ b/drivers/staging/iio/adc/ad7793.c @@ -430,8 +430,8 @@ static irqreturn_t ad7793_trigger_handler(int irq, void *p) static const struct iio_ring_setup_ops ad7793_ring_setup_ops = { .preenable = &ad7793_ring_preenable, - .postenable = &iio_triggered_ring_postenable, - .predisable = &iio_triggered_ring_predisable, + .postenable = &iio_triggered_buffer_postenable, + .predisable = &iio_triggered_buffer_predisable, .postdisable = &ad7793_ring_postdisable, }; diff --git a/drivers/staging/iio/adc/ad7887_ring.c b/drivers/staging/iio/adc/ad7887_ring.c index 36e118cf32e2..159aeb17eed2 100644 --- a/drivers/staging/iio/adc/ad7887_ring.c +++ b/drivers/staging/iio/adc/ad7887_ring.c @@ -149,8 +149,8 @@ done: static const struct iio_ring_setup_ops ad7887_ring_setup_ops = { .preenable = &ad7887_ring_preenable, - .postenable = &iio_triggered_ring_postenable, - .predisable = &iio_triggered_ring_predisable, + .postenable = &iio_triggered_buffer_postenable, + .predisable = &iio_triggered_buffer_predisable, .postdisable = &ad7887_ring_postdisable, }; diff --git a/drivers/staging/iio/adc/ad799x_ring.c b/drivers/staging/iio/adc/ad799x_ring.c index 438e81d190c6..7b6488dce7fe 100644 --- a/drivers/staging/iio/adc/ad799x_ring.c +++ b/drivers/staging/iio/adc/ad799x_ring.c @@ -155,8 +155,8 @@ out: static const struct iio_ring_setup_ops ad799x_buf_setup_ops = { .preenable = &ad799x_ring_preenable, - .postenable = &iio_triggered_ring_postenable, - .predisable = &iio_triggered_ring_predisable, + .postenable = &iio_triggered_buffer_postenable, + .predisable = &iio_triggered_buffer_predisable, }; int ad799x_register_ring_funcs_and_init(struct iio_dev *indio_dev) diff --git a/drivers/staging/iio/adc/max1363_ring.c b/drivers/staging/iio/adc/max1363_ring.c index abe9e03f36e3..ef1c95f5eb9a 100644 --- a/drivers/staging/iio/adc/max1363_ring.c +++ b/drivers/staging/iio/adc/max1363_ring.c @@ -150,9 +150,9 @@ done: } static const struct iio_ring_setup_ops max1363_ring_setup_ops = { - .postenable = &iio_triggered_ring_postenable, + .postenable = &iio_triggered_buffer_postenable, .preenable = &max1363_ring_preenable, - .predisable = &iio_triggered_ring_predisable, + .predisable = &iio_triggered_buffer_predisable, }; int max1363_register_ring_funcs_and_init(struct iio_dev *indio_dev) diff --git a/drivers/staging/iio/gyro/adis16260_ring.c b/drivers/staging/iio/gyro/adis16260_ring.c index 40226f72d869..2b1c65a322bc 100644 --- a/drivers/staging/iio/gyro/adis16260_ring.c +++ b/drivers/staging/iio/gyro/adis16260_ring.c @@ -98,8 +98,8 @@ void adis16260_unconfigure_ring(struct iio_dev *indio_dev) static const struct iio_ring_setup_ops adis16260_ring_setup_ops = { .preenable = &iio_sw_ring_preenable, - .postenable = &iio_triggered_ring_postenable, - .predisable = &iio_triggered_ring_predisable, + .postenable = &iio_triggered_buffer_postenable, + .predisable = &iio_triggered_buffer_predisable, }; int adis16260_configure_ring(struct iio_dev *indio_dev) diff --git a/drivers/staging/iio/imu/adis16400_ring.c b/drivers/staging/iio/imu/adis16400_ring.c index af25697dab98..421a9fab52ee 100644 --- a/drivers/staging/iio/imu/adis16400_ring.c +++ b/drivers/staging/iio/imu/adis16400_ring.c @@ -168,8 +168,8 @@ void adis16400_unconfigure_ring(struct iio_dev *indio_dev) static const struct iio_ring_setup_ops adis16400_ring_setup_ops = { .preenable = &iio_sw_ring_preenable, - .postenable = &iio_triggered_ring_postenable, - .predisable = &iio_triggered_ring_predisable, + .postenable = &iio_triggered_buffer_postenable, + .predisable = &iio_triggered_buffer_predisable, }; int adis16400_configure_ring(struct iio_dev *indio_dev) diff --git a/drivers/staging/iio/industrialio-trigger.c b/drivers/staging/iio/industrialio-trigger.c index a66dcf7ad624..00d0e0c6fe1d 100644 --- a/drivers/staging/iio/industrialio-trigger.c +++ b/drivers/staging/iio/industrialio-trigger.c @@ -488,20 +488,20 @@ void iio_device_unregister_trigger_consumer(struct iio_dev *dev_info) iio_put_trigger(dev_info->trig); } -int iio_triggered_ring_postenable(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; } -EXPORT_SYMBOL(iio_triggered_ring_postenable); +EXPORT_SYMBOL(iio_triggered_buffer_postenable); -int iio_triggered_ring_predisable(struct iio_dev *indio_dev) +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; } -EXPORT_SYMBOL(iio_triggered_ring_predisable); +EXPORT_SYMBOL(iio_triggered_buffer_predisable); diff --git a/drivers/staging/iio/meter/ade7758_ring.c b/drivers/staging/iio/meter/ade7758_ring.c index 9934f508ded2..ece2a4076eee 100644 --- a/drivers/staging/iio/meter/ade7758_ring.c +++ b/drivers/staging/iio/meter/ade7758_ring.c @@ -121,8 +121,8 @@ static int ade7758_ring_preenable(struct iio_dev *indio_dev) static const struct iio_ring_setup_ops ade7758_ring_setup_ops = { .preenable = &ade7758_ring_preenable, - .postenable = &iio_triggered_ring_postenable, - .predisable = &iio_triggered_ring_predisable, + .postenable = &iio_triggered_buffer_postenable, + .predisable = &iio_triggered_buffer_predisable, }; void ade7758_unconfigure_ring(struct iio_dev *indio_dev) diff --git a/drivers/staging/iio/trigger_consumer.h b/drivers/staging/iio/trigger_consumer.h index 418e0bd5f4ce..60d64b356945 100644 --- a/drivers/staging/iio/trigger_consumer.h +++ b/drivers/staging/iio/trigger_consumer.h @@ -48,5 +48,5 @@ void iio_trigger_notify_done(struct iio_trigger *trig); * Two functions for common case where all that happens is a pollfunc * is attached and detached from a trigger */ -int iio_triggered_ring_postenable(struct iio_dev *indio_dev); -int iio_triggered_ring_predisable(struct iio_dev *indio_dev); +int iio_triggered_buffer_postenable(struct iio_dev *indio_dev); +int iio_triggered_buffer_predisable(struct iio_dev *indio_dev); -- 2.20.1