Merge tag 'iio-for-3.8f' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio...

[~andy/linux] / drivers / staging / iio / ring_sw.c

diff --git a/drivers/staging/iio/ring_sw.c b/drivers/staging/iio/ring_sw.c
index f61c8fdaab065a93f183da64b0badd6811c8ffcf..3a45f9a52de803a1b0a434a899defc5b0b5767d9 100644 (file)
--- 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)