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 <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/iio/accel/adis16201_ring.c b/drivers/staging/iio/accel/adis16201_ring.c
index 1c1f35d77c3442dd33b0c54d594d498846fe746c..47be20afbebd650242978b469e1a0930864781d4 100644 (file)
--- 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 d7d692c17b4c7c87667a2d930c927f05c5803891..d86f86dc8fdc679558e6cad4f4b4eccb397549d5 100644 (file)
--- 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 273293aa2006cdbb68d588b9aff76af223bc4e3f..8cc14990531e72815402fbe02322c2ccfd6b7bb7 100644 (file)
--- 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 bc654e2e477b558c7009e33ad76981dc63e14580..941fc5acbfdb66336d72ca891dd9f1dfd5fe74c4 100644 (file)
--- 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 b41e24f02a9aa56432201f336861334500fa3d58..e52ad2e36553458a3fcbbcccf15e5d0a7a689366 100644 (file)
--- 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 c8169338b2761e59ca49e47467ed84dd185480f0..eaecda4d658976b67557f15c84eea7e75c4f0a12 100644 (file)
--- 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 5a389b81cbc85e83b9394643255fbdc0d431c912..3f4e911c458800053cbe92502abbfe3b16881bd8 100644 (file)
--- 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 246b2e724d385b41357d0f376efd83f7f3d80555..9c5ac9dd5efa8eef470c5702743a1e4b15a93413 100644 (file)
--- 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 b109afb8984625a4b8c0eb366802f6e47bfaab8c..3cc673c9e5c7a7f7f7c549a9c0947b69a70f75b5 100644 (file)
--- 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 e6424300c8e72379e12da36551cea225b232738b..320ec68a4a38864cd119bbe41187c0311242e0e4 100644 (file)
--- 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 7044ed2932a70fe12a2c517bed9d76db9ff2f106..565199d0a93935742f3f11cfd301bd2cb1ce1088 100644 (file)
--- 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 36e118cf32e2b95728fe3a0773f6272a92418a4a..159aeb17eed231223b06b14b339fce20c6d6a2ac 100644 (file)
--- 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 438e81d190c68ea06ff1d4bea8dee12a931e08a2..7b6488dce7fed05943d52555d204af46124454d6 100644 (file)
--- 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 abe9e03f36e33ca9c4193c77d3c32d0840f054a6..ef1c95f5eb9a0714fff05fe8b55056b7bc0f9397 100644 (file)
--- 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 40226f72d869965dabcee64addeb4c0dd4b38381..2b1c65a322bc750bed1518f002c2c65cb81e3f6c 100644 (file)
--- 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 af25697dab987073062d2b0748b6d66e55ee8c4e..421a9fab52ee1c5d0ed75ab15ddc81dcc12796d7 100644 (file)
--- 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 a66dcf7ad6243dfd2711fa9fc4f36a854d46bbfb..00d0e0c6fe1d0096e832d422da6615c23a0386ef 100644 (file)
--- 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 9934f508ded27d46ef48aab7cf275c782e59a964..ece2a4076eeed54346785a8c4818d7f149a346fa 100644 (file)
--- 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 418e0bd5f4ce7edb9475f17f91db2c51f4ab65fa..60d64b3569458a7f33c96ea27caa4df908ca9d59 100644 (file)
--- 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);