diff options
author | Lars-Peter Clausen <lars@metafoo.de> | 2012-09-04 07:35:00 -0400 |
---|---|---|
committer | Jonathan Cameron <jic23@kernel.org> | 2012-09-06 17:05:36 -0400 |
commit | 00176b360ce44bcc5dea2bcd0c8ff5ba9309685f (patch) | |
tree | 9e2f38ae051e9a76476557d2aaf8f7fff86a545d | |
parent | f38bc926d022ebd67baad6ac7fc22c95fbc6238c (diff) |
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>
-rw-r--r-- | drivers/staging/iio/accel/adis16201_ring.c | 3 | ||||
-rw-r--r-- | drivers/staging/iio/accel/adis16203_ring.c | 5 | ||||
-rw-r--r-- | drivers/staging/iio/accel/adis16204_ring.c | 3 | ||||
-rw-r--r-- | drivers/staging/iio/accel/adis16209_ring.c | 3 | ||||
-rw-r--r-- | drivers/staging/iio/accel/adis16240_ring.c | 3 | ||||
-rw-r--r-- | drivers/staging/iio/accel/lis3l02dq_ring.c | 3 | ||||
-rw-r--r-- | drivers/staging/iio/adc/ad7298_ring.c | 3 | ||||
-rw-r--r-- | drivers/staging/iio/adc/ad7476_ring.c | 2 | ||||
-rw-r--r-- | drivers/staging/iio/adc/ad7606_ring.c | 3 | ||||
-rw-r--r-- | drivers/staging/iio/adc/ad7887_ring.c | 2 | ||||
-rw-r--r-- | drivers/staging/iio/adc/ad799x_ring.c | 3 | ||||
-rw-r--r-- | drivers/staging/iio/gyro/adis16260_ring.c | 3 | ||||
-rw-r--r-- | drivers/staging/iio/iio_simple_dummy_buffer.c | 2 | ||||
-rw-r--r-- | drivers/staging/iio/impedance-analyzer/ad5933.c | 2 | ||||
-rw-r--r-- | drivers/staging/iio/imu/adis16400_ring.c | 2 | ||||
-rw-r--r-- | drivers/staging/iio/meter/ade7758_ring.c | 3 |
16 files changed, 16 insertions, 29 deletions
diff --git a/drivers/staging/iio/accel/adis16201_ring.c b/drivers/staging/iio/accel/adis16201_ring.c index 03fcf6e319db..884dcf89bce3 100644 --- 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) | |||
62 | struct iio_poll_func *pf = p; | 62 | struct iio_poll_func *pf = p; |
63 | struct iio_dev *indio_dev = pf->indio_dev; | 63 | struct iio_dev *indio_dev = pf->indio_dev; |
64 | struct adis16201_state *st = iio_priv(indio_dev); | 64 | struct adis16201_state *st = iio_priv(indio_dev); |
65 | struct iio_buffer *ring = indio_dev->buffer; | ||
66 | 65 | ||
67 | int i = 0; | 66 | int i = 0; |
68 | s16 *data; | 67 | s16 *data; |
@@ -83,7 +82,7 @@ static irqreturn_t adis16201_trigger_handler(int irq, void *p) | |||
83 | if (indio_dev->scan_timestamp) | 82 | if (indio_dev->scan_timestamp) |
84 | *((s64 *)(data + ((i + 3)/4)*4)) = pf->timestamp; | 83 | *((s64 *)(data + ((i + 3)/4)*4)) = pf->timestamp; |
85 | 84 | ||
86 | ring->access->store_to(ring, (u8 *)data, pf->timestamp); | 85 | iio_push_to_buffer(indio_dev->buffer, (u8 *)data, pf->timestamp); |
87 | 86 | ||
88 | kfree(data); | 87 | kfree(data); |
89 | done: | 88 | done: |
diff --git a/drivers/staging/iio/accel/adis16203_ring.c b/drivers/staging/iio/accel/adis16203_ring.c index c16b2b7323ac..a7ff80490c47 100644 --- 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) | |||
61 | struct iio_poll_func *pf = p; | 61 | struct iio_poll_func *pf = p; |
62 | struct iio_dev *indio_dev = pf->indio_dev; | 62 | struct iio_dev *indio_dev = pf->indio_dev; |
63 | struct adis16203_state *st = iio_priv(indio_dev); | 63 | struct adis16203_state *st = iio_priv(indio_dev); |
64 | struct iio_buffer *ring = indio_dev->buffer; | ||
65 | 64 | ||
66 | int i = 0; | 65 | int i = 0; |
67 | s16 *data; | 66 | s16 *data; |
@@ -82,9 +81,7 @@ static irqreturn_t adis16203_trigger_handler(int irq, void *p) | |||
82 | if (indio_dev->scan_timestamp) | 81 | if (indio_dev->scan_timestamp) |
83 | *((s64 *)(data + ((i + 3)/4)*4)) = pf->timestamp; | 82 | *((s64 *)(data + ((i + 3)/4)*4)) = pf->timestamp; |
84 | 83 | ||
85 | ring->access->store_to(ring, | 84 | iio_push_to_buffer(indio_dev->buffer, (u8 *)data, pf->timestamp); |
86 | (u8 *)data, | ||
87 | pf->timestamp); | ||
88 | 85 | ||
89 | kfree(data); | 86 | kfree(data); |
90 | done: | 87 | done: |
diff --git a/drivers/staging/iio/accel/adis16204_ring.c b/drivers/staging/iio/accel/adis16204_ring.c index 1d2b31cc849e..16e36e3e9d33 100644 --- 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) | |||
59 | struct iio_poll_func *pf = p; | 59 | struct iio_poll_func *pf = p; |
60 | struct iio_dev *indio_dev = pf->indio_dev; | 60 | struct iio_dev *indio_dev = pf->indio_dev; |
61 | struct adis16204_state *st = iio_priv(indio_dev); | 61 | struct adis16204_state *st = iio_priv(indio_dev); |
62 | struct iio_buffer *ring = indio_dev->buffer; | ||
63 | int i = 0; | 62 | int i = 0; |
64 | s16 *data; | 63 | s16 *data; |
65 | 64 | ||
@@ -79,7 +78,7 @@ static irqreturn_t adis16204_trigger_handler(int irq, void *p) | |||
79 | if (indio_dev->scan_timestamp) | 78 | if (indio_dev->scan_timestamp) |
80 | *((s64 *)(data + ((i + 3)/4)*4)) = pf->timestamp; | 79 | *((s64 *)(data + ((i + 3)/4)*4)) = pf->timestamp; |
81 | 80 | ||
82 | ring->access->store_to(ring, (u8 *)data, pf->timestamp); | 81 | iio_push_to_buffer(indio_dev->buffer, (u8 *)data, pf->timestamp); |
83 | 82 | ||
84 | kfree(data); | 83 | kfree(data); |
85 | done: | 84 | done: |
diff --git a/drivers/staging/iio/accel/adis16209_ring.c b/drivers/staging/iio/accel/adis16209_ring.c index 1a4a55c27c7c..5cfeff40fcf6 100644 --- 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) | |||
59 | struct iio_poll_func *pf = p; | 59 | struct iio_poll_func *pf = p; |
60 | struct iio_dev *indio_dev = pf->indio_dev; | 60 | struct iio_dev *indio_dev = pf->indio_dev; |
61 | struct adis16209_state *st = iio_priv(indio_dev); | 61 | struct adis16209_state *st = iio_priv(indio_dev); |
62 | struct iio_buffer *ring = indio_dev->buffer; | ||
63 | int i = 0; | 62 | int i = 0; |
64 | s16 *data; | 63 | s16 *data; |
65 | 64 | ||
@@ -79,7 +78,7 @@ static irqreturn_t adis16209_trigger_handler(int irq, void *p) | |||
79 | if (indio_dev->scan_timestamp) | 78 | if (indio_dev->scan_timestamp) |
80 | *((s64 *)(data + ((i + 3)/4)*4)) = pf->timestamp; | 79 | *((s64 *)(data + ((i + 3)/4)*4)) = pf->timestamp; |
81 | 80 | ||
82 | ring->access->store_to(ring, (u8 *)data, pf->timestamp); | 81 | iio_push_to_buffer(indio_dev->buffer, (u8 *)data, pf->timestamp); |
83 | 82 | ||
84 | kfree(data); | 83 | kfree(data); |
85 | done: | 84 | done: |
diff --git a/drivers/staging/iio/accel/adis16240_ring.c b/drivers/staging/iio/accel/adis16240_ring.c index 360dfed6d4d1..d5ec43e877b5 100644 --- 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) | |||
56 | struct iio_poll_func *pf = p; | 56 | struct iio_poll_func *pf = p; |
57 | struct iio_dev *indio_dev = pf->indio_dev; | 57 | struct iio_dev *indio_dev = pf->indio_dev; |
58 | struct adis16240_state *st = iio_priv(indio_dev); | 58 | struct adis16240_state *st = iio_priv(indio_dev); |
59 | struct iio_buffer *ring = indio_dev->buffer; | ||
60 | 59 | ||
61 | int i = 0; | 60 | int i = 0; |
62 | s16 *data; | 61 | s16 *data; |
@@ -77,7 +76,7 @@ static irqreturn_t adis16240_trigger_handler(int irq, void *p) | |||
77 | if (indio_dev->scan_timestamp) | 76 | if (indio_dev->scan_timestamp) |
78 | *((s64 *)(data + ((i + 3)/4)*4)) = pf->timestamp; | 77 | *((s64 *)(data + ((i + 3)/4)*4)) = pf->timestamp; |
79 | 78 | ||
80 | ring->access->store_to(ring, (u8 *)data, pf->timestamp); | 79 | iio_push_to_buffer(indio_dev->buffer, (u8 *)data, pf->timestamp); |
81 | 80 | ||
82 | kfree(data); | 81 | kfree(data); |
83 | done: | 82 | done: |
diff --git a/drivers/staging/iio/accel/lis3l02dq_ring.c b/drivers/staging/iio/accel/lis3l02dq_ring.c index 7da2703885d6..9332762da718 100644 --- 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) | |||
135 | { | 135 | { |
136 | struct iio_poll_func *pf = p; | 136 | struct iio_poll_func *pf = p; |
137 | struct iio_dev *indio_dev = pf->indio_dev; | 137 | struct iio_dev *indio_dev = pf->indio_dev; |
138 | struct iio_buffer *buffer = indio_dev->buffer; | ||
139 | int len = 0; | 138 | int len = 0; |
140 | char *data; | 139 | char *data; |
141 | 140 | ||
@@ -153,7 +152,7 @@ static irqreturn_t lis3l02dq_trigger_handler(int irq, void *p) | |||
153 | if (indio_dev->scan_timestamp) | 152 | if (indio_dev->scan_timestamp) |
154 | *(s64 *)((u8 *)data + ALIGN(len, sizeof(s64))) | 153 | *(s64 *)((u8 *)data + ALIGN(len, sizeof(s64))) |
155 | = pf->timestamp; | 154 | = pf->timestamp; |
156 | buffer->access->store_to(buffer, (u8 *)data, pf->timestamp); | 155 | iio_push_to_buffer(indio_dev->buffer, (u8 *)data, pf->timestamp); |
157 | 156 | ||
158 | kfree(data); | 157 | kfree(data); |
159 | done: | 158 | done: |
diff --git a/drivers/staging/iio/adc/ad7298_ring.c b/drivers/staging/iio/adc/ad7298_ring.c index 506016f01593..9fce4045cbb9 100644 --- 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) | |||
75 | struct iio_poll_func *pf = p; | 75 | struct iio_poll_func *pf = p; |
76 | struct iio_dev *indio_dev = pf->indio_dev; | 76 | struct iio_dev *indio_dev = pf->indio_dev; |
77 | struct ad7298_state *st = iio_priv(indio_dev); | 77 | struct ad7298_state *st = iio_priv(indio_dev); |
78 | struct iio_buffer *ring = indio_dev->buffer; | ||
79 | s64 time_ns = 0; | 78 | s64 time_ns = 0; |
80 | __u16 buf[16]; | 79 | __u16 buf[16]; |
81 | int b_sent, i; | 80 | int b_sent, i; |
@@ -94,7 +93,7 @@ static irqreturn_t ad7298_trigger_handler(int irq, void *p) | |||
94 | indio_dev->masklength); i++) | 93 | indio_dev->masklength); i++) |
95 | buf[i] = be16_to_cpu(st->rx_buf[i]); | 94 | buf[i] = be16_to_cpu(st->rx_buf[i]); |
96 | 95 | ||
97 | indio_dev->buffer->access->store_to(ring, (u8 *)buf, time_ns); | 96 | iio_push_to_buffer(indio_dev->buffer, (u8 *)buf, time_ns); |
98 | 97 | ||
99 | done: | 98 | done: |
100 | iio_trigger_notify_done(indio_dev->trig); | 99 | 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 d087b21c51f6..3741ac6131db 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) | |||
44 | memcpy(rxbuf + indio_dev->scan_bytes - sizeof(s64), | 44 | memcpy(rxbuf + indio_dev->scan_bytes - sizeof(s64), |
45 | &time_ns, sizeof(time_ns)); | 45 | &time_ns, sizeof(time_ns)); |
46 | 46 | ||
47 | indio_dev->buffer->access->store_to(indio_dev->buffer, rxbuf, time_ns); | 47 | iio_push_to_buffer(indio_dev->buffer, rxbuf, time_ns); |
48 | done: | 48 | done: |
49 | iio_trigger_notify_done(indio_dev->trig); | 49 | iio_trigger_notify_done(indio_dev->trig); |
50 | kfree(rxbuf); | 50 | kfree(rxbuf); |
diff --git a/drivers/staging/iio/adc/ad7606_ring.c b/drivers/staging/iio/adc/ad7606_ring.c index f15afe47c20d..f4b009ee6635 100644 --- 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) | |||
46 | struct ad7606_state *st = container_of(work_s, struct ad7606_state, | 46 | struct ad7606_state *st = container_of(work_s, struct ad7606_state, |
47 | poll_work); | 47 | poll_work); |
48 | struct iio_dev *indio_dev = iio_priv_to_dev(st); | 48 | struct iio_dev *indio_dev = iio_priv_to_dev(st); |
49 | struct iio_buffer *ring = indio_dev->buffer; | ||
50 | s64 time_ns; | 49 | s64 time_ns; |
51 | __u8 *buf; | 50 | __u8 *buf; |
52 | int ret; | 51 | int ret; |
@@ -84,7 +83,7 @@ static void ad7606_poll_bh_to_ring(struct work_struct *work_s) | |||
84 | if (indio_dev->scan_timestamp) | 83 | if (indio_dev->scan_timestamp) |
85 | *((s64 *)(buf + indio_dev->scan_bytes - sizeof(s64))) = time_ns; | 84 | *((s64 *)(buf + indio_dev->scan_bytes - sizeof(s64))) = time_ns; |
86 | 85 | ||
87 | ring->access->store_to(indio_dev->buffer, buf, time_ns); | 86 | iio_push_to_buffer(indio_dev->buffer, buf, time_ns); |
88 | done: | 87 | done: |
89 | gpio_set_value(st->pdata->gpio_convst, 0); | 88 | gpio_set_value(st->pdata->gpio_convst, 0); |
90 | iio_trigger_notify_done(indio_dev->trig); | 89 | 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 c76fdb5081c2..a4ff4935982d 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) | |||
95 | memcpy(buf + indio_dev->scan_bytes - sizeof(s64), | 95 | memcpy(buf + indio_dev->scan_bytes - sizeof(s64), |
96 | &time_ns, sizeof(time_ns)); | 96 | &time_ns, sizeof(time_ns)); |
97 | 97 | ||
98 | indio_dev->buffer->access->store_to(indio_dev->buffer, buf, time_ns); | 98 | iio_push_to_buffer(indio_dev->buffer, buf, time_ns); |
99 | done: | 99 | done: |
100 | kfree(buf); | 100 | kfree(buf); |
101 | iio_trigger_notify_done(indio_dev->trig); | 101 | 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 858a685e3889..84275c3c6b26 100644 --- 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) | |||
35 | struct iio_poll_func *pf = p; | 35 | struct iio_poll_func *pf = p; |
36 | struct iio_dev *indio_dev = pf->indio_dev; | 36 | struct iio_dev *indio_dev = pf->indio_dev; |
37 | struct ad799x_state *st = iio_priv(indio_dev); | 37 | struct ad799x_state *st = iio_priv(indio_dev); |
38 | struct iio_buffer *ring = indio_dev->buffer; | ||
39 | s64 time_ns; | 38 | s64 time_ns; |
40 | __u8 *rxbuf; | 39 | __u8 *rxbuf; |
41 | int b_sent; | 40 | int b_sent; |
@@ -78,7 +77,7 @@ static irqreturn_t ad799x_trigger_handler(int irq, void *p) | |||
78 | memcpy(rxbuf + indio_dev->scan_bytes - sizeof(s64), | 77 | memcpy(rxbuf + indio_dev->scan_bytes - sizeof(s64), |
79 | &time_ns, sizeof(time_ns)); | 78 | &time_ns, sizeof(time_ns)); |
80 | 79 | ||
81 | ring->access->store_to(indio_dev->buffer, rxbuf, time_ns); | 80 | iio_push_to_buffer(indio_dev->buffer, rxbuf, time_ns); |
82 | done: | 81 | done: |
83 | kfree(rxbuf); | 82 | kfree(rxbuf); |
84 | out: | 83 | out: |
diff --git a/drivers/staging/iio/gyro/adis16260_ring.c b/drivers/staging/iio/gyro/adis16260_ring.c index eeee8e760e6c..e6e234503824 100644 --- 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) | |||
62 | struct iio_poll_func *pf = p; | 62 | struct iio_poll_func *pf = p; |
63 | struct iio_dev *indio_dev = pf->indio_dev; | 63 | struct iio_dev *indio_dev = pf->indio_dev; |
64 | struct adis16260_state *st = iio_priv(indio_dev); | 64 | struct adis16260_state *st = iio_priv(indio_dev); |
65 | struct iio_buffer *ring = indio_dev->buffer; | ||
66 | int i = 0; | 65 | int i = 0; |
67 | s16 *data; | 66 | s16 *data; |
68 | 67 | ||
@@ -82,7 +81,7 @@ static irqreturn_t adis16260_trigger_handler(int irq, void *p) | |||
82 | if (indio_dev->scan_timestamp) | 81 | if (indio_dev->scan_timestamp) |
83 | *((s64 *)(data + ((i + 3)/4)*4)) = pf->timestamp; | 82 | *((s64 *)(data + ((i + 3)/4)*4)) = pf->timestamp; |
84 | 83 | ||
85 | ring->access->store_to(ring, (u8 *)data, pf->timestamp); | 84 | iio_push_to_buffer(indio_dev->buffer, (u8 *)data, pf->timestamp); |
86 | 85 | ||
87 | kfree(data); | 86 | kfree(data); |
88 | done: | 87 | done: |
diff --git a/drivers/staging/iio/iio_simple_dummy_buffer.c b/drivers/staging/iio/iio_simple_dummy_buffer.c index bd628de472a9..e08021362ecf 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) | |||
87 | if (indio_dev->scan_timestamp) | 87 | if (indio_dev->scan_timestamp) |
88 | *(s64 *)((u8 *)data + ALIGN(len, sizeof(s64))) | 88 | *(s64 *)((u8 *)data + ALIGN(len, sizeof(s64))) |
89 | = iio_get_time_ns(); | 89 | = iio_get_time_ns(); |
90 | buffer->access->store_to(buffer, (u8 *)data, pf->timestamp); | 90 | iio_push_to_buffer(buffer, (u8 *)data, pf->timestamp); |
91 | 91 | ||
92 | kfree(data); | 92 | kfree(data); |
93 | 93 | ||
diff --git a/drivers/staging/iio/impedance-analyzer/ad5933.c b/drivers/staging/iio/impedance-analyzer/ad5933.c index e239ea91f407..39a9be8b7d8e 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) | |||
678 | buf[0] = be16_to_cpu(buf[0]); | 678 | buf[0] = be16_to_cpu(buf[0]); |
679 | } | 679 | } |
680 | /* save datum to the ring */ | 680 | /* save datum to the ring */ |
681 | ring->access->store_to(ring, (u8 *)buf, iio_get_time_ns()); | 681 | iio_push_to_buffer(ring, (u8 *)buf, iio_get_time_ns()); |
682 | } else { | 682 | } else { |
683 | /* no data available - try again later */ | 683 | /* no data available - try again later */ |
684 | schedule_delayed_work(&st->work, st->poll_time_jiffies); | 684 | 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 beec650ddbdb..6b717886b5b4 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) | |||
150 | /* Guaranteed to be aligned with 8 byte boundary */ | 150 | /* Guaranteed to be aligned with 8 byte boundary */ |
151 | if (ring->scan_timestamp) | 151 | if (ring->scan_timestamp) |
152 | *((s64 *)(data + ((i + 3)/4)*4)) = pf->timestamp; | 152 | *((s64 *)(data + ((i + 3)/4)*4)) = pf->timestamp; |
153 | ring->access->store_to(indio_dev->buffer, (u8 *) data, pf->timestamp); | 153 | iio_push_to_buffer(ring, (u8 *) data, pf->timestamp); |
154 | 154 | ||
155 | done: | 155 | done: |
156 | kfree(data); | 156 | kfree(data); |
diff --git a/drivers/staging/iio/meter/ade7758_ring.c b/drivers/staging/iio/meter/ade7758_ring.c index 1ce10b21f4d6..23c107a09ceb 100644 --- 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) | |||
61 | { | 61 | { |
62 | struct iio_poll_func *pf = p; | 62 | struct iio_poll_func *pf = p; |
63 | struct iio_dev *indio_dev = pf->indio_dev; | 63 | struct iio_dev *indio_dev = pf->indio_dev; |
64 | struct iio_buffer *ring = indio_dev->buffer; | ||
65 | struct ade7758_state *st = iio_priv(indio_dev); | 64 | struct ade7758_state *st = iio_priv(indio_dev); |
66 | s64 dat64[2]; | 65 | s64 dat64[2]; |
67 | u32 *dat32 = (u32 *)dat64; | 66 | u32 *dat32 = (u32 *)dat64; |
@@ -74,7 +73,7 @@ static irqreturn_t ade7758_trigger_handler(int irq, void *p) | |||
74 | if (indio_dev->scan_timestamp) | 73 | if (indio_dev->scan_timestamp) |
75 | dat64[1] = pf->timestamp; | 74 | dat64[1] = pf->timestamp; |
76 | 75 | ||
77 | ring->access->store_to(ring, (u8 *)dat64, pf->timestamp); | 76 | iio_push_to_buffer(indio_dev->buffer, (u8 *)dat64, pf->timestamp); |
78 | 77 | ||
79 | iio_trigger_notify_done(indio_dev->trig); | 78 | iio_trigger_notify_done(indio_dev->trig); |
80 | 79 | ||