staging:iio:various move default scan mask setting after ring register or remove

[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 45017d3..bc654e2 100644 (file)
--- a/drivers/staging/iio/accel/adis16209_ring.c
+++ b/drivers/staging/iio/accel/adis16209_ring.c
@@ -1,20 +1,12 @@
 #include <linux/interrupt.h>
-#include <linux/irq.h>
-#include <linux/gpio.h>
-#include <linux/workqueue.h>
 #include <linux/mutex.h>
-#include <linux/device.h>
 #include <linux/kernel.h>
 #include <linux/spi/spi.h>
 #include <linux/slab.h>
-#include <linux/sysfs.h>
-#include <linux/list.h>
 
 #include "../iio.h"
-#include "../sysfs.h"
 #include "../ring_sw.h"
-#include "accel.h"
-#include "../trigger.h"
+#include "../trigger_consumer.h"
 #include "adis16209.h"
 
 /**
@@ -65,7 +57,7 @@ static int adis16209_read_ring_data(struct device *dev, u8 *rx)
 static irqreturn_t adis16209_trigger_handler(int irq, void *p)
 {
        struct iio_poll_func *pf = p;
-       struct iio_dev *indio_dev = pf->private_data;
+       struct iio_dev *indio_dev = pf->indio_dev;
        struct adis16209_state *st = iio_priv(indio_dev);
        struct iio_ring_buffer *ring = indio_dev->ring;
 
@@ -126,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,