30 files changed, 34 insertions, 43 deletions

diff --git a/drivers/iio/accel/hid-sensor-accel-3d.c b/drivers/iio/accel/hid-sensor-accel-3d.c
index c593eb239270..314a4057879e 100644
--- a/drivers/iio/accel/hid-sensor-accel-3d.c
+++ b/drivers/iio/accel/hid-sensor-accel-3d.c
@@ -198,7 +198,6 @@ static const struct iio_info accel_3d_info = {
 static void hid_sensor_push_data(struct iio_dev *indio_dev, u8 *data, int len)
 {
         struct iio_buffer *buffer = indio_dev->buffer;
-        s64 timestamp = iio_get_time_ns();
         int datum_sz;
 
         dev_dbg(&indio_dev->dev, "hid_sensor_push_data\n");
@@ -212,7 +211,7 @@ static void hid_sensor_push_data(struct iio_dev *indio_dev, u8 *data, int len)
                                 datum_sz);
                 return;
         }
-        iio_push_to_buffer(buffer, (u8 *)data, timestamp);
+        iio_push_to_buffer(buffer, (u8 *)data);
 }
 
 /* Callback handler to send event after all samples are received and captured */
diff --git a/drivers/iio/adc/ad7266.c b/drivers/iio/adc/ad7266.c
index 5c3f1ba5a06d..b11f214779a2 100644
--- a/drivers/iio/adc/ad7266.c
+++ b/drivers/iio/adc/ad7266.c
@@ -99,7 +99,7 @@ static irqreturn_t ad7266_trigger_handler(int irq, void *p)
         if (ret == 0) {
                 if (indio_dev->scan_timestamp)
                         ((s64 *)st->data)[1] = pf->timestamp;
-                iio_push_to_buffer(buffer, (u8 *)st->data, pf->timestamp);
+                iio_push_to_buffer(buffer, (u8 *)st->data);
         }
 
         iio_trigger_notify_done(indio_dev->trig);
diff --git a/drivers/iio/adc/ad_sigma_delta.c b/drivers/iio/adc/ad_sigma_delta.c
index ae847c5a1361..67baa1363d7a 100644
--- a/drivers/iio/adc/ad_sigma_delta.c
+++ b/drivers/iio/adc/ad_sigma_delta.c
@@ -391,7 +391,7 @@ static irqreturn_t ad_sd_trigger_handler(int irq, void *p)
                 break;
         }
 
-        iio_push_to_buffer(indio_dev->buffer, (uint8_t *)data, pf->timestamp);
+        iio_push_to_buffer(indio_dev->buffer, (uint8_t *)data);
 
         iio_trigger_notify_done(indio_dev->trig);
         sigma_delta->irq_dis = false;
diff --git a/drivers/iio/adc/at91_adc.c b/drivers/iio/adc/at91_adc.c
index c1e4690f188d..bc10091fe76c 100644
--- a/drivers/iio/adc/at91_adc.c
+++ b/drivers/iio/adc/at91_adc.c
@@ -82,7 +82,7 @@ static irqreturn_t at91_adc_trigger_handler(int irq, void *p)
                 *timestamp = pf->timestamp;
         }
 
-        buffer->access->store_to(buffer, (u8 *)st->buffer, pf->timestamp);
+        buffer->access->store_to(buffer, (u8 *)st->buffer);
 
         iio_trigger_notify_done(idev->trig);
         st->irq_enabled = true;
diff --git a/drivers/iio/gyro/hid-sensor-gyro-3d.c b/drivers/iio/gyro/hid-sensor-gyro-3d.c
index 94a4740135e7..4c56ada51c39 100644
--- a/drivers/iio/gyro/hid-sensor-gyro-3d.c
+++ b/drivers/iio/gyro/hid-sensor-gyro-3d.c
@@ -198,7 +198,6 @@ static const struct iio_info gyro_3d_info = {
 static void hid_sensor_push_data(struct iio_dev *indio_dev, u8 *data, int len)
 {
         struct iio_buffer *buffer = indio_dev->buffer;
-        s64 timestamp = iio_get_time_ns();
         int datum_sz;
 
         dev_dbg(&indio_dev->dev, "hid_sensor_push_data\n");
@@ -212,7 +211,7 @@ static void hid_sensor_push_data(struct iio_dev *indio_dev, u8 *data, int len)
                                 datum_sz);
                 return;
         }
-        iio_push_to_buffer(buffer, (u8 *)data, timestamp);
+        iio_push_to_buffer(buffer, (u8 *)data);
 }
 
 /* Callback handler to send event after all samples are received and captured */
diff --git a/drivers/iio/industrialio-buffer.c b/drivers/iio/industrialio-buffer.c
index 774891cf8139..d4ad37455a67 100644
--- a/drivers/iio/industrialio-buffer.c
+++ b/drivers/iio/industrialio-buffer.c
@@ -682,12 +682,11 @@ static unsigned char *iio_demux(struct iio_buffer *buffer,
         return buffer->demux_bounce;
 }
 
-int iio_push_to_buffer(struct iio_buffer *buffer, unsigned char *data,
-                       s64 timestamp)
+int iio_push_to_buffer(struct iio_buffer *buffer, unsigned char *data)
 {
         unsigned char *dataout = iio_demux(buffer, data);
 
-        return buffer->access->store_to(buffer, dataout, timestamp);
+        return buffer->access->store_to(buffer, dataout);
 }
 EXPORT_SYMBOL_GPL(iio_push_to_buffer);
 
diff --git a/drivers/iio/kfifo_buf.c b/drivers/iio/kfifo_buf.c
index 63da42498a9a..5bc5c860e9ca 100644
--- a/drivers/iio/kfifo_buf.c
+++ b/drivers/iio/kfifo_buf.c
@@ -95,8 +95,7 @@ static int iio_set_length_kfifo(struct iio_buffer *r, int length)
 }
 
 static int iio_store_to_kfifo(struct iio_buffer *r,
-                              u8 *data,
-                              s64 timestamp)
+                              u8 *data)
 {
         int ret;
         struct iio_kfifo *kf = iio_to_kfifo(r);
diff --git a/drivers/iio/light/adjd_s311.c b/drivers/iio/light/adjd_s311.c
index 9a99f43094f0..164b62b91a4b 100644
--- a/drivers/iio/light/adjd_s311.c
+++ b/drivers/iio/light/adjd_s311.c
@@ -187,7 +187,7 @@ static irqreturn_t adjd_s311_trigger_handler(int irq, void *p)
         if (indio_dev->scan_timestamp)
                 *(s64 *)((u8 *)data->buffer + ALIGN(len, sizeof(s64)))
                         = time_ns;
-        iio_push_to_buffer(buffer, (u8 *)data->buffer, time_ns);
+        iio_push_to_buffer(buffer, (u8 *)data->buffer);
 
 done:
         iio_trigger_notify_done(indio_dev->trig);
diff --git a/drivers/iio/light/hid-sensor-als.c b/drivers/iio/light/hid-sensor-als.c
index b3c8e91b2c8d..96e3691e42c4 100644
--- a/drivers/iio/light/hid-sensor-als.c
+++ b/drivers/iio/light/hid-sensor-als.c
@@ -177,7 +177,6 @@ static const struct iio_info als_info = {
 static void hid_sensor_push_data(struct iio_dev *indio_dev, u8 *data, int len)
 {
         struct iio_buffer *buffer = indio_dev->buffer;
-        s64 timestamp = iio_get_time_ns();
         int datum_sz;
 
         dev_dbg(&indio_dev->dev, "hid_sensor_push_data\n");
@@ -191,7 +190,7 @@ static void hid_sensor_push_data(struct iio_dev *indio_dev, u8 *data, int len)
                                 datum_sz);
                 return;
         }
-        iio_push_to_buffer(buffer, (u8 *)data, timestamp);
+        iio_push_to_buffer(buffer, (u8 *)data);
 }
 
 /* Callback handler to send event after all samples are received and captured */
diff --git a/drivers/iio/magnetometer/hid-sensor-magn-3d.c b/drivers/iio/magnetometer/hid-sensor-magn-3d.c
index 397704eded97..c4f0d274f577 100644
--- a/drivers/iio/magnetometer/hid-sensor-magn-3d.c
+++ b/drivers/iio/magnetometer/hid-sensor-magn-3d.c
@@ -199,7 +199,6 @@ static const struct iio_info magn_3d_info = {
 static void hid_sensor_push_data(struct iio_dev *indio_dev, u8 *data, int len)
 {
         struct iio_buffer *buffer = indio_dev->buffer;
-        s64 timestamp = iio_get_time_ns();
         int datum_sz;
 
         dev_dbg(&indio_dev->dev, "hid_sensor_push_data\n");
@@ -213,7 +212,7 @@ static void hid_sensor_push_data(struct iio_dev *indio_dev, u8 *data, int len)
                                 datum_sz);
                 return;
         }
-        iio_push_to_buffer(buffer, (u8 *)data, timestamp);
+        iio_push_to_buffer(buffer, (u8 *)data);
 }
 
 /* Callback handler to send event after all samples are received and captured */
diff --git a/drivers/staging/iio/accel/adis16201_ring.c b/drivers/staging/iio/accel/adis16201_ring.c
index 884dcf89bce3..97c09f0c26ae 100644
--- a/drivers/staging/iio/accel/adis16201_ring.c
+++ b/drivers/staging/iio/accel/adis16201_ring.c
@@ -82,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;
 
-        iio_push_to_buffer(indio_dev->buffer, (u8 *)data, pf->timestamp);
+        iio_push_to_buffer(indio_dev->buffer, (u8 *)data);
 
         kfree(data);
 done:
diff --git a/drivers/staging/iio/accel/adis16203_ring.c b/drivers/staging/iio/accel/adis16203_ring.c
index a7ff80490c47..7507e1a04591 100644
--- a/drivers/staging/iio/accel/adis16203_ring.c
+++ b/drivers/staging/iio/accel/adis16203_ring.c
@@ -81,7 +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;
 
-        iio_push_to_buffer(indio_dev->buffer, (u8 *)data, pf->timestamp);
+        iio_push_to_buffer(indio_dev->buffer, (u8 *)data);
 
         kfree(data);
 done:
diff --git a/drivers/staging/iio/accel/adis16204_ring.c b/drivers/staging/iio/accel/adis16204_ring.c
index 16e36e3e9d33..4c976bec986b 100644
--- a/drivers/staging/iio/accel/adis16204_ring.c
+++ b/drivers/staging/iio/accel/adis16204_ring.c
@@ -78,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;
 
-        iio_push_to_buffer(indio_dev->buffer, (u8 *)data, pf->timestamp);
+        iio_push_to_buffer(indio_dev->buffer, (u8 *)data);
 
         kfree(data);
 done:
diff --git a/drivers/staging/iio/accel/adis16209_ring.c b/drivers/staging/iio/accel/adis16209_ring.c
index 5cfeff40fcf6..f939e29d6c82 100644
--- a/drivers/staging/iio/accel/adis16209_ring.c
+++ b/drivers/staging/iio/accel/adis16209_ring.c
@@ -78,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;
 
-        iio_push_to_buffer(indio_dev->buffer, (u8 *)data, pf->timestamp);
+        iio_push_to_buffer(indio_dev->buffer, (u8 *)data);
 
         kfree(data);
 done:
diff --git a/drivers/staging/iio/accel/adis16240_ring.c b/drivers/staging/iio/accel/adis16240_ring.c
index d5ec43e877b5..caff8e25e0a2 100644
--- a/drivers/staging/iio/accel/adis16240_ring.c
+++ b/drivers/staging/iio/accel/adis16240_ring.c
@@ -76,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;
 
-        iio_push_to_buffer(indio_dev->buffer, (u8 *)data, pf->timestamp);
+        iio_push_to_buffer(indio_dev->buffer, (u8 *)data);
 
         kfree(data);
 done:
diff --git a/drivers/staging/iio/accel/lis3l02dq_ring.c b/drivers/staging/iio/accel/lis3l02dq_ring.c
index 9332762da718..247605ce5051 100644
--- a/drivers/staging/iio/accel/lis3l02dq_ring.c
+++ b/drivers/staging/iio/accel/lis3l02dq_ring.c
@@ -152,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;
-        iio_push_to_buffer(indio_dev->buffer, (u8 *)data, pf->timestamp);
+        iio_push_to_buffer(indio_dev->buffer, (u8 *)data);
 
         kfree(data);
 done:
diff --git a/drivers/staging/iio/adc/ad7298_ring.c b/drivers/staging/iio/adc/ad7298_ring.c
index 9fce4045cbb9..c2906a85fedb 100644
--- a/drivers/staging/iio/adc/ad7298_ring.c
+++ b/drivers/staging/iio/adc/ad7298_ring.c
@@ -93,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]);
 
-        iio_push_to_buffer(indio_dev->buffer, (u8 *)buf, time_ns);
+        iio_push_to_buffer(indio_dev->buffer, (u8 *)buf);
 
 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 3741ac6131db..940681f29b87 100644
--- 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));
 
-        iio_push_to_buffer(indio_dev->buffer, rxbuf, time_ns);
+        iio_push_to_buffer(indio_dev->buffer, rxbuf);
 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 f4b009ee6635..ba04d0ffd4f4 100644
--- a/drivers/staging/iio/adc/ad7606_ring.c
+++ b/drivers/staging/iio/adc/ad7606_ring.c
@@ -83,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;
 
-        iio_push_to_buffer(indio_dev->buffer, buf, time_ns);
+        iio_push_to_buffer(indio_dev->buffer, buf);
 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 a4ff4935982d..b39923bbeedc 100644
--- 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));
 
-        iio_push_to_buffer(indio_dev->buffer, buf, time_ns);
+        iio_push_to_buffer(indio_dev->buffer, buf);
 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 84275c3c6b26..86026d9b20bc 100644
--- a/drivers/staging/iio/adc/ad799x_ring.c
+++ b/drivers/staging/iio/adc/ad799x_ring.c
@@ -77,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));
 
-        iio_push_to_buffer(indio_dev->buffer, rxbuf, time_ns);
+        iio_push_to_buffer(indio_dev->buffer, rxbuf);
 done:
         kfree(rxbuf);
 out:
diff --git a/drivers/staging/iio/adc/max1363_ring.c b/drivers/staging/iio/adc/max1363_ring.c
index 774ae1b63550..5f74f3b7671a 100644
--- a/drivers/staging/iio/adc/max1363_ring.c
+++ b/drivers/staging/iio/adc/max1363_ring.c
@@ -80,7 +80,7 @@ static irqreturn_t max1363_trigger_handler(int irq, void *p)
 
         if (indio_dev->scan_timestamp)
                 memcpy(rxbuf + d_size - sizeof(s64), &time_ns, sizeof(time_ns));
-        iio_push_to_buffer(indio_dev->buffer, rxbuf, time_ns);
+        iio_push_to_buffer(indio_dev->buffer, rxbuf);
 
 done_free:
         kfree(rxbuf);
diff --git a/drivers/staging/iio/adc/mxs-lradc.c b/drivers/staging/iio/adc/mxs-lradc.c
index ae549e572e5d..ca7c1fa88e71 100644
--- a/drivers/staging/iio/adc/mxs-lradc.c
+++ b/drivers/staging/iio/adc/mxs-lradc.c
@@ -256,7 +256,7 @@ static irqreturn_t mxs_lradc_trigger_handler(int irq, void *p)
                 *timestamp = pf->timestamp;
         }
 
-        iio_push_to_buffer(buffer, (u8 *)lradc->buffer, pf->timestamp);
+        iio_push_to_buffer(buffer, (u8 *)lradc->buffer);
 
         iio_trigger_notify_done(iio->trig);
 
diff --git a/drivers/staging/iio/gyro/adis16260_ring.c b/drivers/staging/iio/gyro/adis16260_ring.c
index e6e234503824..e294cb49736d 100644
--- a/drivers/staging/iio/gyro/adis16260_ring.c
+++ b/drivers/staging/iio/gyro/adis16260_ring.c
@@ -81,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;
 
-        iio_push_to_buffer(indio_dev->buffer, (u8 *)data, pf->timestamp);
+        iio_push_to_buffer(indio_dev->buffer, (u8 *)data);
 
         kfree(data);
 done:
diff --git a/drivers/staging/iio/iio_simple_dummy_buffer.c b/drivers/staging/iio/iio_simple_dummy_buffer.c
index e08021362ecf..1fd38095b2ca 100644
--- 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();
-        iio_push_to_buffer(buffer, (u8 *)data, pf->timestamp);
+        iio_push_to_buffer(buffer, (u8 *)data);
 
         kfree(data);
 
diff --git a/drivers/staging/iio/impedance-analyzer/ad5933.c b/drivers/staging/iio/impedance-analyzer/ad5933.c
index 39a9be8b7d8e..de21d47f33e9 100644
--- 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 */
-                iio_push_to_buffer(ring, (u8 *)buf, iio_get_time_ns());
+                iio_push_to_buffer(ring, (u8 *)buf);
         } 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 6b717886b5b4..260bdd1a4681 100644
--- 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;
-        iio_push_to_buffer(ring, (u8 *) data, pf->timestamp);
+        iio_push_to_buffer(ring, (u8 *) data);
 
 done:
         kfree(data);
diff --git a/drivers/staging/iio/meter/ade7758_ring.c b/drivers/staging/iio/meter/ade7758_ring.c
index 23c107a09ceb..9e49baccf660 100644
--- a/drivers/staging/iio/meter/ade7758_ring.c
+++ b/drivers/staging/iio/meter/ade7758_ring.c
@@ -73,7 +73,7 @@ static irqreturn_t ade7758_trigger_handler(int irq, void *p)
         if (indio_dev->scan_timestamp)
                 dat64[1] = pf->timestamp;
 
-        iio_push_to_buffer(indio_dev->buffer, (u8 *)dat64, pf->timestamp);
+        iio_push_to_buffer(indio_dev->buffer, (u8 *)dat64);
 
         iio_trigger_notify_done(indio_dev->trig);
 
diff --git a/drivers/staging/iio/ring_sw.c b/drivers/staging/iio/ring_sw.c
index f61c8fdaab06..3a45f9a52de8 100644
--- a/drivers/staging/iio/ring_sw.c
+++ b/drivers/staging/iio/ring_sw.c
@@ -65,7 +65,7 @@ static inline void __iio_free_sw_ring_buffer(struct iio_sw_ring_buffer *ring)
 /* Lock always held if their is a chance this may be called */
 /* Only one of these per ring may run concurrently - enforced by drivers */
 static int iio_store_to_sw_ring(struct iio_sw_ring_buffer *ring,
-                                unsigned char *data, s64 timestamp)
+                                unsigned char *data)
 {
         int ret = 0;
         unsigned char *temp_ptr, *change_test_ptr;
@@ -256,11 +256,10 @@ error_ret:
 }
 
 static int iio_store_to_sw_rb(struct iio_buffer *r,
-                              u8 *data,
-                              s64 timestamp)
+                              u8 *data)
 {
         struct iio_sw_ring_buffer *ring = iio_to_sw_ring(r);
-        return iio_store_to_sw_ring(ring, data, timestamp);
+        return iio_store_to_sw_ring(ring, data);
 }
 
 static int iio_request_update_sw_rb(struct iio_buffer *r)
diff --git a/include/linux/iio/buffer.h b/include/linux/iio/buffer.h
index 8ba516fc2ec6..c629b3a1d9a9 100644
--- a/include/linux/iio/buffer.h
+++ b/include/linux/iio/buffer.h
@@ -36,7 +36,7 @@ struct iio_buffer;
  * any of them not existing.
  **/
 struct iio_buffer_access_funcs {
-        int (*store_to)(struct iio_buffer *buffer, u8 *data, s64 timestamp);
+        int (*store_to)(struct iio_buffer *buffer, u8 *data);
         int (*read_first_n)(struct iio_buffer *buffer,
                             size_t n,
                             char __user *buf);
@@ -118,10 +118,8 @@ int iio_scan_mask_set(struct iio_dev *indio_dev,
  * iio_push_to_buffer() - push to a registered buffer.
  * @buffer:             IIO buffer structure for device
  * @data:               the data to push to the buffer
- * @timestamp:          timestamp to associate with the data
  */
-int iio_push_to_buffer(struct iio_buffer *buffer, unsigned char *data,
-                       s64 timestamp);
+int iio_push_to_buffer(struct iio_buffer *buffer, unsigned char *data);
 
 int iio_update_demux(struct iio_dev *indio_dev);