staging:iio: Use iio_push_to_buffer

Consistently use iio_push_to_buffer instead of manually calling the buffers
store_to callback.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>

diff --git a/drivers/staging/iio/accel/adis16201_ring.c b/drivers/staging/iio/accel/adis16201_ring.c
index 03fcf6e319db65ecde366d39fb5d407c6794ed9d..884dcf89bce3b8a2e0849a62a3cf8f91d288df33 100644 (file)
--- a/drivers/staging/iio/accel/adis16201_ring.c
+++ b/drivers/staging/iio/accel/adis16201_ring.c
@@ -62,7 +62,6 @@ static irqreturn_t adis16201_trigger_handler(int irq, void *p)
        struct iio_poll_func *pf = p;
        struct iio_dev *indio_dev = pf->indio_dev;
        struct adis16201_state *st = iio_priv(indio_dev);
-       struct iio_buffer *ring = indio_dev->buffer;
 
        int i = 0;
        s16 *data;
@@ -83,7 +82,7 @@ static irqreturn_t adis16201_trigger_handler(int irq, void *p)
        if (indio_dev->scan_timestamp)
                *((s64 *)(data + ((i + 3)/4)*4)) = pf->timestamp;
 
-       ring->access->store_to(ring, (u8 *)data, pf->timestamp);
+       iio_push_to_buffer(indio_dev->buffer, (u8 *)data, pf->timestamp);
 
        kfree(data);
 done:

diff --git a/drivers/staging/iio/accel/adis16203_ring.c b/drivers/staging/iio/accel/adis16203_ring.c
index c16b2b7323ac2e500c7d377f59a5e37faa3c87f3..a7ff80490c471575922f24d64e155f89d22c3724 100644 (file)
--- a/drivers/staging/iio/accel/adis16203_ring.c
+++ b/drivers/staging/iio/accel/adis16203_ring.c
@@ -61,7 +61,6 @@ static irqreturn_t adis16203_trigger_handler(int irq, void *p)
        struct iio_poll_func *pf = p;
        struct iio_dev *indio_dev = pf->indio_dev;
        struct adis16203_state *st = iio_priv(indio_dev);
-       struct iio_buffer *ring = indio_dev->buffer;
 
        int i = 0;
        s16 *data;
@@ -82,9 +81,7 @@ static irqreturn_t adis16203_trigger_handler(int irq, void *p)
        if (indio_dev->scan_timestamp)
                *((s64 *)(data + ((i + 3)/4)*4)) = pf->timestamp;
 
-       ring->access->store_to(ring,
-                             (u8 *)data,
-                             pf->timestamp);
+       iio_push_to_buffer(indio_dev->buffer, (u8 *)data, pf->timestamp);
 
        kfree(data);
 done:

diff --git a/drivers/staging/iio/accel/adis16204_ring.c b/drivers/staging/iio/accel/adis16204_ring.c
index 1d2b31cc849e81428ef6e061146ca31d1a55395a..16e36e3e9d33f44508283c017931a0d195908a40 100644 (file)
--- a/drivers/staging/iio/accel/adis16204_ring.c
+++ b/drivers/staging/iio/accel/adis16204_ring.c
@@ -59,7 +59,6 @@ static irqreturn_t adis16204_trigger_handler(int irq, void *p)
        struct iio_poll_func *pf = p;
        struct iio_dev *indio_dev = pf->indio_dev;
        struct adis16204_state *st = iio_priv(indio_dev);
-       struct iio_buffer *ring = indio_dev->buffer;
        int i = 0;
        s16 *data;
 
@@ -79,7 +78,7 @@ static irqreturn_t adis16204_trigger_handler(int irq, void *p)
        if (indio_dev->scan_timestamp)
                *((s64 *)(data + ((i + 3)/4)*4)) = pf->timestamp;
 
-       ring->access->store_to(ring, (u8 *)data, pf->timestamp);
+       iio_push_to_buffer(indio_dev->buffer, (u8 *)data, pf->timestamp);
 
        kfree(data);
 done:

diff --git a/drivers/staging/iio/accel/adis16209_ring.c b/drivers/staging/iio/accel/adis16209_ring.c
index 1a4a55c27c7c7795fbe9370afee5a5fdf98036c3..5cfeff40fcf65a49cebe4a350f49d9c123dd2383 100644 (file)
--- a/drivers/staging/iio/accel/adis16209_ring.c
+++ b/drivers/staging/iio/accel/adis16209_ring.c
@@ -59,7 +59,6 @@ static irqreturn_t adis16209_trigger_handler(int irq, void *p)
        struct iio_poll_func *pf = p;
        struct iio_dev *indio_dev = pf->indio_dev;
        struct adis16209_state *st = iio_priv(indio_dev);
-       struct iio_buffer *ring = indio_dev->buffer;
        int i = 0;
        s16 *data;
 
@@ -79,7 +78,7 @@ static irqreturn_t adis16209_trigger_handler(int irq, void *p)
        if (indio_dev->scan_timestamp)
                *((s64 *)(data + ((i + 3)/4)*4)) = pf->timestamp;
 
-       ring->access->store_to(ring, (u8 *)data, pf->timestamp);
+       iio_push_to_buffer(indio_dev->buffer, (u8 *)data, pf->timestamp);
 
        kfree(data);
 done:

diff --git a/drivers/staging/iio/accel/adis16240_ring.c b/drivers/staging/iio/accel/adis16240_ring.c
index 360dfed6d4d15022b25a416754495804cfc0f336..d5ec43e877b580cf90693b6ac3f6b79ffed28ad3 100644 (file)
--- a/drivers/staging/iio/accel/adis16240_ring.c
+++ b/drivers/staging/iio/accel/adis16240_ring.c
@@ -56,7 +56,6 @@ static irqreturn_t adis16240_trigger_handler(int irq, void *p)
        struct iio_poll_func *pf = p;
        struct iio_dev *indio_dev = pf->indio_dev;
        struct adis16240_state *st = iio_priv(indio_dev);
-       struct iio_buffer *ring = indio_dev->buffer;
 
        int i = 0;
        s16 *data;
@@ -77,7 +76,7 @@ static irqreturn_t adis16240_trigger_handler(int irq, void *p)
        if (indio_dev->scan_timestamp)
                *((s64 *)(data + ((i + 3)/4)*4)) = pf->timestamp;
 
-       ring->access->store_to(ring, (u8 *)data, pf->timestamp);
+       iio_push_to_buffer(indio_dev->buffer, (u8 *)data, pf->timestamp);
 
        kfree(data);
 done:

diff --git a/drivers/staging/iio/accel/lis3l02dq_ring.c b/drivers/staging/iio/accel/lis3l02dq_ring.c
index 7da2703885d66c88930371fe000978bebeedea1b..9332762da7181a02aa13e625dfe81d88170834f8 100644 (file)
--- a/drivers/staging/iio/accel/lis3l02dq_ring.c
+++ b/drivers/staging/iio/accel/lis3l02dq_ring.c
@@ -135,7 +135,6 @@ static irqreturn_t lis3l02dq_trigger_handler(int irq, void *p)
 {
        struct iio_poll_func *pf = p;
        struct iio_dev *indio_dev = pf->indio_dev;
-       struct iio_buffer *buffer = indio_dev->buffer;
        int len = 0;
        char *data;
 
@@ -153,7 +152,7 @@ static irqreturn_t lis3l02dq_trigger_handler(int irq, void *p)
        if (indio_dev->scan_timestamp)
                *(s64 *)((u8 *)data + ALIGN(len, sizeof(s64)))
                        = pf->timestamp;
-       buffer->access->store_to(buffer, (u8 *)data, pf->timestamp);
+       iio_push_to_buffer(indio_dev->buffer, (u8 *)data, pf->timestamp);
 
        kfree(data);
 done:

diff --git a/drivers/staging/iio/adc/ad7298_ring.c b/drivers/staging/iio/adc/ad7298_ring.c
index 506016f01593c6bdd7a68279f19fa1363b2d21f8..9fce4045cbb99125582587f3ee19b28d20da6681 100644 (file)
--- a/drivers/staging/iio/adc/ad7298_ring.c
+++ b/drivers/staging/iio/adc/ad7298_ring.c
@@ -75,7 +75,6 @@ static irqreturn_t ad7298_trigger_handler(int irq, void *p)
        struct iio_poll_func *pf = p;
        struct iio_dev *indio_dev = pf->indio_dev;
        struct ad7298_state *st = iio_priv(indio_dev);
-       struct iio_buffer *ring = indio_dev->buffer;
        s64 time_ns = 0;
        __u16 buf[16];
        int b_sent, i;
@@ -94,7 +93,7 @@ static irqreturn_t ad7298_trigger_handler(int irq, void *p)
                                                 indio_dev->masklength); i++)
                buf[i] = be16_to_cpu(st->rx_buf[i]);
 
-       indio_dev->buffer->access->store_to(ring, (u8 *)buf, time_ns);
+       iio_push_to_buffer(indio_dev->buffer, (u8 *)buf, time_ns);
 
 done:
        iio_trigger_notify_done(indio_dev->trig);

diff --git a/drivers/staging/iio/adc/ad7476_ring.c b/drivers/staging/iio/adc/ad7476_ring.c
index d087b21c51f608c64806fcaa33beab30debe075e..3741ac6131dbef4b2a259c7c91cd9808b0a64686 100644 (file)
--- a/drivers/staging/iio/adc/ad7476_ring.c
+++ b/drivers/staging/iio/adc/ad7476_ring.c
@@ -44,7 +44,7 @@ static irqreturn_t ad7476_trigger_handler(int irq, void  *p)
                memcpy(rxbuf + indio_dev->scan_bytes - sizeof(s64),
                        &time_ns, sizeof(time_ns));
 
-       indio_dev->buffer->access->store_to(indio_dev->buffer, rxbuf, time_ns);
+       iio_push_to_buffer(indio_dev->buffer, rxbuf, time_ns);
 done:
        iio_trigger_notify_done(indio_dev->trig);
        kfree(rxbuf);

diff --git a/drivers/staging/iio/adc/ad7606_ring.c b/drivers/staging/iio/adc/ad7606_ring.c
index f15afe47c20d6ebd888638d5624032050cdf5e2c..f4b009ee6635d415cd233af34fcfd1a24ee65769 100644 (file)
--- a/drivers/staging/iio/adc/ad7606_ring.c
+++ b/drivers/staging/iio/adc/ad7606_ring.c
@@ -46,7 +46,6 @@ static void ad7606_poll_bh_to_ring(struct work_struct *work_s)
        struct ad7606_state *st = container_of(work_s, struct ad7606_state,
                                                poll_work);
        struct iio_dev *indio_dev = iio_priv_to_dev(st);
-       struct iio_buffer *ring = indio_dev->buffer;
        s64 time_ns;
        __u8 *buf;
        int ret;
@@ -84,7 +83,7 @@ static void ad7606_poll_bh_to_ring(struct work_struct *work_s)
        if (indio_dev->scan_timestamp)
                *((s64 *)(buf + indio_dev->scan_bytes - sizeof(s64))) = time_ns;
 
-       ring->access->store_to(indio_dev->buffer, buf, time_ns);
+       iio_push_to_buffer(indio_dev->buffer, buf, time_ns);
 done:
        gpio_set_value(st->pdata->gpio_convst, 0);
        iio_trigger_notify_done(indio_dev->trig);

diff --git a/drivers/staging/iio/adc/ad7887_ring.c b/drivers/staging/iio/adc/ad7887_ring.c
index c76fdb5081c2c9fed713becd14530b4eff944b63..a4ff4935982d3f7a074a0149696385fff0fbe2cb 100644 (file)
--- a/drivers/staging/iio/adc/ad7887_ring.c
+++ b/drivers/staging/iio/adc/ad7887_ring.c
@@ -95,7 +95,7 @@ static irqreturn_t ad7887_trigger_handler(int irq, void *p)
                memcpy(buf + indio_dev->scan_bytes - sizeof(s64),
                       &time_ns, sizeof(time_ns));
 
-       indio_dev->buffer->access->store_to(indio_dev->buffer, buf, time_ns);
+       iio_push_to_buffer(indio_dev->buffer, buf, time_ns);
 done:
        kfree(buf);
        iio_trigger_notify_done(indio_dev->trig);

diff --git a/drivers/staging/iio/adc/ad799x_ring.c b/drivers/staging/iio/adc/ad799x_ring.c
index 858a685e388947576559de28613a696197468672..84275c3c6b2636b553ca340bf1079ec398a445ab 100644 (file)
--- a/drivers/staging/iio/adc/ad799x_ring.c
+++ b/drivers/staging/iio/adc/ad799x_ring.c
@@ -35,7 +35,6 @@ static irqreturn_t ad799x_trigger_handler(int irq, void *p)
        struct iio_poll_func *pf = p;
        struct iio_dev *indio_dev = pf->indio_dev;
        struct ad799x_state *st = iio_priv(indio_dev);
-       struct iio_buffer *ring = indio_dev->buffer;
        s64 time_ns;
        __u8 *rxbuf;
        int b_sent;
@@ -78,7 +77,7 @@ static irqreturn_t ad799x_trigger_handler(int irq, void *p)
                memcpy(rxbuf + indio_dev->scan_bytes - sizeof(s64),
                        &time_ns, sizeof(time_ns));
 
-       ring->access->store_to(indio_dev->buffer, rxbuf, time_ns);
+       iio_push_to_buffer(indio_dev->buffer, rxbuf, time_ns);
 done:
        kfree(rxbuf);
 out:

diff --git a/drivers/staging/iio/gyro/adis16260_ring.c b/drivers/staging/iio/gyro/adis16260_ring.c
index eeee8e760e6cc68fd7b672398deb2a4702f35282..e6e23450382432da8f5d7a8f38da842a857dca51 100644 (file)
--- a/drivers/staging/iio/gyro/adis16260_ring.c
+++ b/drivers/staging/iio/gyro/adis16260_ring.c
@@ -62,7 +62,6 @@ static irqreturn_t adis16260_trigger_handler(int irq, void *p)
        struct iio_poll_func *pf = p;
        struct iio_dev *indio_dev = pf->indio_dev;
        struct adis16260_state *st = iio_priv(indio_dev);
-       struct iio_buffer *ring = indio_dev->buffer;
        int i = 0;
        s16 *data;
 
@@ -82,7 +81,7 @@ static irqreturn_t adis16260_trigger_handler(int irq, void *p)
        if (indio_dev->scan_timestamp)
                *((s64 *)(data + ((i + 3)/4)*4)) = pf->timestamp;
 
-       ring->access->store_to(ring, (u8 *)data, pf->timestamp);
+       iio_push_to_buffer(indio_dev->buffer, (u8 *)data, pf->timestamp);
 
        kfree(data);
 done:

diff --git a/drivers/staging/iio/iio_simple_dummy_buffer.c b/drivers/staging/iio/iio_simple_dummy_buffer.c
index bd628de472a9f431db96e23ee8a5017d004a9bce..e08021362ecf410ae92f018131bc0510fd7616c5 100644 (file)
--- a/drivers/staging/iio/iio_simple_dummy_buffer.c
+++ b/drivers/staging/iio/iio_simple_dummy_buffer.c
@@ -87,7 +87,7 @@ static irqreturn_t iio_simple_dummy_trigger_h(int irq, void *p)
        if (indio_dev->scan_timestamp)
                *(s64 *)((u8 *)data + ALIGN(len, sizeof(s64)))
                        = iio_get_time_ns();
-       buffer->access->store_to(buffer, (u8 *)data, pf->timestamp);
+       iio_push_to_buffer(buffer, (u8 *)data, pf->timestamp);
 
        kfree(data);
 

diff --git a/drivers/staging/iio/impedance-analyzer/ad5933.c b/drivers/staging/iio/impedance-analyzer/ad5933.c
index e239ea91f407186c77811a5b71d8c2d0b486545e..39a9be8b7d8e5d0f25d2d35c58efebcdc8267778 100644 (file)
--- a/drivers/staging/iio/impedance-analyzer/ad5933.c
+++ b/drivers/staging/iio/impedance-analyzer/ad5933.c
@@ -678,7 +678,7 @@ static void ad5933_work(struct work_struct *work)
                        buf[0] = be16_to_cpu(buf[0]);
                }
                /* save datum to the ring */
-               ring->access->store_to(ring, (u8 *)buf, iio_get_time_ns());
+               iio_push_to_buffer(ring, (u8 *)buf, iio_get_time_ns());
        } else {
                /* no data available - try again later */
                schedule_delayed_work(&st->work, st->poll_time_jiffies);

diff --git a/drivers/staging/iio/imu/adis16400_ring.c b/drivers/staging/iio/imu/adis16400_ring.c
index beec650ddbdbf0648ed4dfa9106bf87d5a2a8d0e..6b717886b5b447e7f7e85ece2f5c3e1c9e80c399 100644 (file)
--- a/drivers/staging/iio/imu/adis16400_ring.c
+++ b/drivers/staging/iio/imu/adis16400_ring.c
@@ -150,7 +150,7 @@ static irqreturn_t adis16400_trigger_handler(int irq, void *p)
        /* Guaranteed to be aligned with 8 byte boundary */
        if (ring->scan_timestamp)
                *((s64 *)(data + ((i + 3)/4)*4)) = pf->timestamp;
-       ring->access->store_to(indio_dev->buffer, (u8 *) data, pf->timestamp);
+       iio_push_to_buffer(ring, (u8 *) data, pf->timestamp);
 
 done:
        kfree(data);

diff --git a/drivers/staging/iio/meter/ade7758_ring.c b/drivers/staging/iio/meter/ade7758_ring.c
index 1ce10b21f4d699089eb391ce11e4a2c9314cae5a..23c107a09ceb0cf555caaecd218b705ec98a667e 100644 (file)
--- a/drivers/staging/iio/meter/ade7758_ring.c
+++ b/drivers/staging/iio/meter/ade7758_ring.c
@@ -61,7 +61,6 @@ static irqreturn_t ade7758_trigger_handler(int irq, void *p)
 {
        struct iio_poll_func *pf = p;
        struct iio_dev *indio_dev = pf->indio_dev;
-       struct iio_buffer *ring = indio_dev->buffer;
        struct ade7758_state *st = iio_priv(indio_dev);
        s64 dat64[2];
        u32 *dat32 = (u32 *)dat64;
@@ -74,7 +73,7 @@ static irqreturn_t ade7758_trigger_handler(int irq, void *p)
        if (indio_dev->scan_timestamp)
                dat64[1] = pf->timestamp;
 
-       ring->access->store_to(ring, (u8 *)dat64, pf->timestamp);
+       iio_push_to_buffer(indio_dev->buffer, (u8 *)dat64, pf->timestamp);
 
        iio_trigger_notify_done(indio_dev->trig);