staging:iio: treewide rename iio_triggered_ring_* to iio_triggered_buffer_*

[pandora-kernel.git] / drivers / staging / iio / accel / adis16209_ring.c

diff --git a/drivers/staging/iio/accel/adis16209_ring.c b/drivers/staging/iio/accel/adis16209_ring.c
index 1652f15..941fc5a 100644 (file)
--- a/drivers/staging/iio/accel/adis16209_ring.c
+++ b/drivers/staging/iio/accel/adis16209_ring.c
@@ -6,7 +6,7 @@
 
 #include "../iio.h"
 #include "../ring_sw.h"
-#include "../trigger.h"
+#include "../trigger_consumer.h"
 #include "adis16209.h"
 
 /**
@@ -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)
@@ -118,16 +118,6 @@ int adis16209_configure_ring(struct iio_dev *indio_dev)
        ring->setup_ops = &adis16209_ring_setup_ops;
        ring->owner = THIS_MODULE;
 
-       /* Set default scan mode */
-       iio_scan_mask_set(ring, ADIS16209_SCAN_SUPPLY);
-       iio_scan_mask_set(ring, ADIS16209_SCAN_ACC_X);
-       iio_scan_mask_set(ring, ADIS16209_SCAN_ACC_Y);
-       iio_scan_mask_set(ring, ADIS16209_SCAN_AUX_ADC);
-       iio_scan_mask_set(ring, ADIS16209_SCAN_TEMP);
-       iio_scan_mask_set(ring, ADIS16209_SCAN_INCLI_X);
-       iio_scan_mask_set(ring, ADIS16209_SCAN_INCLI_Y);
-       iio_scan_mask_set(ring, ADIS16209_SCAN_ROT);
-
        indio_dev->pollfunc = iio_alloc_pollfunc(&iio_pollfunc_store_time,
                                                 &adis16209_trigger_handler,
                                                 IRQF_ONESHOT,