staging:iio: treewide rename iio_triggered_ring_* to iio_triggered_buffer_*

[pandora-kernel.git] / drivers / staging / iio / adc / max1363_ring.c

diff --git a/drivers/staging/iio/adc/max1363_ring.c b/drivers/staging/iio/adc/max1363_ring.c
index f43befd..ef1c95f 100644 (file)
--- a/drivers/staging/iio/adc/max1363_ring.c
+++ b/drivers/staging/iio/adc/max1363_ring.c
@@ -9,28 +9,26 @@
  */
 
 #include <linux/interrupt.h>
-#include <linux/device.h>
 #include <linux/slab.h>
 #include <linux/kernel.h>
-#include <linux/sysfs.h>
-#include <linux/list.h>
 #include <linux/i2c.h>
 #include <linux/bitops.h>
 
 #include "../iio.h"
 #include "../ring_generic.h"
 #include "../ring_sw.h"
-#include "../trigger.h"
-#include "../sysfs.h"
+#include "../trigger_consumer.h"
 
 #include "max1363.h"
 
-int max1363_single_channel_from_ring(long mask, struct max1363_state *st)
+int max1363_single_channel_from_ring(const long *mask, struct max1363_state *st)
 {
        struct iio_ring_buffer *ring = iio_priv_to_dev(st)->ring;
-       int count = 0, ret;
+       int count = 0, ret, index;
        u8 *ring_data;
-       if (!(st->current_mode->modemask & mask)) {
+       index = find_first_bit(mask, MAX1363_MAX_CHANNELS);
+
+       if (!(test_bit(index, st->current_mode->modemask))) {
                ret = -EBUSY;
                goto error_ret;
        }
@@ -45,12 +43,8 @@ int max1363_single_channel_from_ring(long mask, struct max1363_state *st)
        if (ret)
                goto error_free_ring_data;
        /* Need a count of channels prior to this one */
-       mask >>= 1;
-       while (mask) {
-               if (mask & st->current_mode->modemask)
-                       count++;
-               mask >>= 1;
-       }
+
+       count = bitmap_weight(mask, index - 1);
        if (st->chip_info->bits != 8)
                ret = ((int)(ring_data[count*2 + 0] & 0x0F) << 8)
                        + (int)(ring_data[count*2 + 1]);
@@ -89,7 +83,8 @@ static int max1363_ring_preenable(struct iio_dev *indio_dev)
 
        max1363_set_scan_mode(st);
 
-       numvals = hweight_long(st->current_mode->modemask);
+       numvals = bitmap_weight(st->current_mode->modemask,
+                               indio_dev->masklength);
        if (ring->access->set_bytes_per_datum) {
                if (ring->scan_timestamp)
                        d_size += sizeof(s64);
@@ -108,13 +103,14 @@ static int max1363_ring_preenable(struct iio_dev *indio_dev)
 static irqreturn_t max1363_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 max1363_state *st = iio_priv(indio_dev);
        s64 time_ns;
        __u8 *rxbuf;
        int b_sent;
        size_t d_size;
-       unsigned long numvals = hweight_long(st->current_mode->modemask);
+       unsigned long numvals = bitmap_weight(st->current_mode->modemask,
+                                             MAX1363_MAX_CHANNELS);
 
        /* Ensure the timestamp is 8 byte aligned */
        if (st->chip_info->bits != 8)
@@ -154,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)
@@ -199,11 +195,6 @@ error_ret:
 void max1363_ring_cleanup(struct iio_dev *indio_dev)
 {
        /* ensure that the trigger has been detached */
-       if (indio_dev->trig) {
-               iio_put_trigger(indio_dev->trig);
-               iio_trigger_dettach_poll_func(indio_dev->trig,
-                                             indio_dev->pollfunc);
-       }
        iio_dealloc_pollfunc(indio_dev->pollfunc);
        iio_sw_rb_free(indio_dev->ring);
 }