Merge branch 'next/drivers' into HEAD

[deliverable/linux.git] / drivers / staging / iio / meter / ade7758_ring.c

diff --git a/drivers/staging/iio/meter/ade7758_ring.c b/drivers/staging/iio/meter/ade7758_ring.c
index 1ce10b21f4d699089eb391ce11e4a2c9314cae5a..9e49baccf660eb4d303859fc8166df6817b2326e 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);
 
        iio_trigger_notify_done(indio_dev->trig);