Merge remote-tracking branch 'staging/staging-next'

[karo-tx-linux.git] / drivers / staging / iio / adc / ad7606_ring.c

diff --git a/drivers/staging/iio/adc/ad7606_ring.c b/drivers/staging/iio/adc/ad7606_ring.c
index 2b25cb07fe41d1470513424380de4ab439657191..3bf174cb19b1ef3573482896fef1848a3f7941ff 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);
-       s64 time_ns;
        __u8 *buf;
        int ret;
 
@@ -78,12 +77,7 @@ static void ad7606_poll_bh_to_ring(struct work_struct *work_s)
                        goto done;
        }
 
-       time_ns = iio_get_time_ns();
-
-       if (indio_dev->scan_timestamp)
-               *((s64 *)(buf + indio_dev->scan_bytes - sizeof(s64))) = time_ns;
-
-       iio_push_to_buffers(indio_dev, buf);
+       iio_push_to_buffers_with_timestamp(indio_dev, buf, iio_get_time_ns());
 done:
        gpio_set_value(st->pdata->gpio_convst, 0);
        iio_trigger_notify_done(indio_dev->trig);