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>
This commit is contained in:
parent
f38bc926d0
commit
00176b360c
16 changed files with 16 additions and 29 deletions
|
@ -62,7 +62,6 @@ static irqreturn_t adis16201_trigger_handler(int irq, void *p)
|
||||||
struct iio_poll_func *pf = p;
|
struct iio_poll_func *pf = p;
|
||||||
struct iio_dev *indio_dev = pf->indio_dev;
|
struct iio_dev *indio_dev = pf->indio_dev;
|
||||||
struct adis16201_state *st = iio_priv(indio_dev);
|
struct adis16201_state *st = iio_priv(indio_dev);
|
||||||
struct iio_buffer *ring = indio_dev->buffer;
|
|
||||||
|
|
||||||
int i = 0;
|
int i = 0;
|
||||||
s16 *data;
|
s16 *data;
|
||||||
|
@ -83,7 +82,7 @@ static irqreturn_t adis16201_trigger_handler(int irq, void *p)
|
||||||
if (indio_dev->scan_timestamp)
|
if (indio_dev->scan_timestamp)
|
||||||
*((s64 *)(data + ((i + 3)/4)*4)) = pf->timestamp;
|
*((s64 *)(data + ((i + 3)/4)*4)) = pf->timestamp;
|
||||||
|
|
||||||
ring->access->store_to(ring, (u8 *)data, pf->timestamp);
|
iio_push_to_buffer(indio_dev->buffer, (u8 *)data, pf->timestamp);
|
||||||
|
|
||||||
kfree(data);
|
kfree(data);
|
||||||
done:
|
done:
|
||||||
|
|
|
@ -61,7 +61,6 @@ static irqreturn_t adis16203_trigger_handler(int irq, void *p)
|
||||||
struct iio_poll_func *pf = p;
|
struct iio_poll_func *pf = p;
|
||||||
struct iio_dev *indio_dev = pf->indio_dev;
|
struct iio_dev *indio_dev = pf->indio_dev;
|
||||||
struct adis16203_state *st = iio_priv(indio_dev);
|
struct adis16203_state *st = iio_priv(indio_dev);
|
||||||
struct iio_buffer *ring = indio_dev->buffer;
|
|
||||||
|
|
||||||
int i = 0;
|
int i = 0;
|
||||||
s16 *data;
|
s16 *data;
|
||||||
|
@ -82,9 +81,7 @@ static irqreturn_t adis16203_trigger_handler(int irq, void *p)
|
||||||
if (indio_dev->scan_timestamp)
|
if (indio_dev->scan_timestamp)
|
||||||
*((s64 *)(data + ((i + 3)/4)*4)) = pf->timestamp;
|
*((s64 *)(data + ((i + 3)/4)*4)) = pf->timestamp;
|
||||||
|
|
||||||
ring->access->store_to(ring,
|
iio_push_to_buffer(indio_dev->buffer, (u8 *)data, pf->timestamp);
|
||||||
(u8 *)data,
|
|
||||||
pf->timestamp);
|
|
||||||
|
|
||||||
kfree(data);
|
kfree(data);
|
||||||
done:
|
done:
|
||||||
|
|
|
@ -59,7 +59,6 @@ static irqreturn_t adis16204_trigger_handler(int irq, void *p)
|
||||||
struct iio_poll_func *pf = p;
|
struct iio_poll_func *pf = p;
|
||||||
struct iio_dev *indio_dev = pf->indio_dev;
|
struct iio_dev *indio_dev = pf->indio_dev;
|
||||||
struct adis16204_state *st = iio_priv(indio_dev);
|
struct adis16204_state *st = iio_priv(indio_dev);
|
||||||
struct iio_buffer *ring = indio_dev->buffer;
|
|
||||||
int i = 0;
|
int i = 0;
|
||||||
s16 *data;
|
s16 *data;
|
||||||
|
|
||||||
|
@ -79,7 +78,7 @@ static irqreturn_t adis16204_trigger_handler(int irq, void *p)
|
||||||
if (indio_dev->scan_timestamp)
|
if (indio_dev->scan_timestamp)
|
||||||
*((s64 *)(data + ((i + 3)/4)*4)) = pf->timestamp;
|
*((s64 *)(data + ((i + 3)/4)*4)) = pf->timestamp;
|
||||||
|
|
||||||
ring->access->store_to(ring, (u8 *)data, pf->timestamp);
|
iio_push_to_buffer(indio_dev->buffer, (u8 *)data, pf->timestamp);
|
||||||
|
|
||||||
kfree(data);
|
kfree(data);
|
||||||
done:
|
done:
|
||||||
|
|
|
@ -59,7 +59,6 @@ static irqreturn_t adis16209_trigger_handler(int irq, void *p)
|
||||||
struct iio_poll_func *pf = p;
|
struct iio_poll_func *pf = p;
|
||||||
struct iio_dev *indio_dev = pf->indio_dev;
|
struct iio_dev *indio_dev = pf->indio_dev;
|
||||||
struct adis16209_state *st = iio_priv(indio_dev);
|
struct adis16209_state *st = iio_priv(indio_dev);
|
||||||
struct iio_buffer *ring = indio_dev->buffer;
|
|
||||||
int i = 0;
|
int i = 0;
|
||||||
s16 *data;
|
s16 *data;
|
||||||
|
|
||||||
|
@ -79,7 +78,7 @@ static irqreturn_t adis16209_trigger_handler(int irq, void *p)
|
||||||
if (indio_dev->scan_timestamp)
|
if (indio_dev->scan_timestamp)
|
||||||
*((s64 *)(data + ((i + 3)/4)*4)) = pf->timestamp;
|
*((s64 *)(data + ((i + 3)/4)*4)) = pf->timestamp;
|
||||||
|
|
||||||
ring->access->store_to(ring, (u8 *)data, pf->timestamp);
|
iio_push_to_buffer(indio_dev->buffer, (u8 *)data, pf->timestamp);
|
||||||
|
|
||||||
kfree(data);
|
kfree(data);
|
||||||
done:
|
done:
|
||||||
|
|
|
@ -56,7 +56,6 @@ static irqreturn_t adis16240_trigger_handler(int irq, void *p)
|
||||||
struct iio_poll_func *pf = p;
|
struct iio_poll_func *pf = p;
|
||||||
struct iio_dev *indio_dev = pf->indio_dev;
|
struct iio_dev *indio_dev = pf->indio_dev;
|
||||||
struct adis16240_state *st = iio_priv(indio_dev);
|
struct adis16240_state *st = iio_priv(indio_dev);
|
||||||
struct iio_buffer *ring = indio_dev->buffer;
|
|
||||||
|
|
||||||
int i = 0;
|
int i = 0;
|
||||||
s16 *data;
|
s16 *data;
|
||||||
|
@ -77,7 +76,7 @@ static irqreturn_t adis16240_trigger_handler(int irq, void *p)
|
||||||
if (indio_dev->scan_timestamp)
|
if (indio_dev->scan_timestamp)
|
||||||
*((s64 *)(data + ((i + 3)/4)*4)) = pf->timestamp;
|
*((s64 *)(data + ((i + 3)/4)*4)) = pf->timestamp;
|
||||||
|
|
||||||
ring->access->store_to(ring, (u8 *)data, pf->timestamp);
|
iio_push_to_buffer(indio_dev->buffer, (u8 *)data, pf->timestamp);
|
||||||
|
|
||||||
kfree(data);
|
kfree(data);
|
||||||
done:
|
done:
|
||||||
|
|
|
@ -135,7 +135,6 @@ static irqreturn_t lis3l02dq_trigger_handler(int irq, void *p)
|
||||||
{
|
{
|
||||||
struct iio_poll_func *pf = p;
|
struct iio_poll_func *pf = p;
|
||||||
struct iio_dev *indio_dev = pf->indio_dev;
|
struct iio_dev *indio_dev = pf->indio_dev;
|
||||||
struct iio_buffer *buffer = indio_dev->buffer;
|
|
||||||
int len = 0;
|
int len = 0;
|
||||||
char *data;
|
char *data;
|
||||||
|
|
||||||
|
@ -153,7 +152,7 @@ static irqreturn_t lis3l02dq_trigger_handler(int irq, void *p)
|
||||||
if (indio_dev->scan_timestamp)
|
if (indio_dev->scan_timestamp)
|
||||||
*(s64 *)((u8 *)data + ALIGN(len, sizeof(s64)))
|
*(s64 *)((u8 *)data + ALIGN(len, sizeof(s64)))
|
||||||
= pf->timestamp;
|
= pf->timestamp;
|
||||||
buffer->access->store_to(buffer, (u8 *)data, pf->timestamp);
|
iio_push_to_buffer(indio_dev->buffer, (u8 *)data, pf->timestamp);
|
||||||
|
|
||||||
kfree(data);
|
kfree(data);
|
||||||
done:
|
done:
|
||||||
|
|
|
@ -75,7 +75,6 @@ static irqreturn_t ad7298_trigger_handler(int irq, void *p)
|
||||||
struct iio_poll_func *pf = p;
|
struct iio_poll_func *pf = p;
|
||||||
struct iio_dev *indio_dev = pf->indio_dev;
|
struct iio_dev *indio_dev = pf->indio_dev;
|
||||||
struct ad7298_state *st = iio_priv(indio_dev);
|
struct ad7298_state *st = iio_priv(indio_dev);
|
||||||
struct iio_buffer *ring = indio_dev->buffer;
|
|
||||||
s64 time_ns = 0;
|
s64 time_ns = 0;
|
||||||
__u16 buf[16];
|
__u16 buf[16];
|
||||||
int b_sent, i;
|
int b_sent, i;
|
||||||
|
@ -94,7 +93,7 @@ static irqreturn_t ad7298_trigger_handler(int irq, void *p)
|
||||||
indio_dev->masklength); i++)
|
indio_dev->masklength); i++)
|
||||||
buf[i] = be16_to_cpu(st->rx_buf[i]);
|
buf[i] = be16_to_cpu(st->rx_buf[i]);
|
||||||
|
|
||||||
indio_dev->buffer->access->store_to(ring, (u8 *)buf, time_ns);
|
iio_push_to_buffer(indio_dev->buffer, (u8 *)buf, time_ns);
|
||||||
|
|
||||||
done:
|
done:
|
||||||
iio_trigger_notify_done(indio_dev->trig);
|
iio_trigger_notify_done(indio_dev->trig);
|
||||||
|
|
|
@ -44,7 +44,7 @@ static irqreturn_t ad7476_trigger_handler(int irq, void *p)
|
||||||
memcpy(rxbuf + indio_dev->scan_bytes - sizeof(s64),
|
memcpy(rxbuf + indio_dev->scan_bytes - sizeof(s64),
|
||||||
&time_ns, sizeof(time_ns));
|
&time_ns, sizeof(time_ns));
|
||||||
|
|
||||||
indio_dev->buffer->access->store_to(indio_dev->buffer, rxbuf, time_ns);
|
iio_push_to_buffer(indio_dev->buffer, rxbuf, time_ns);
|
||||||
done:
|
done:
|
||||||
iio_trigger_notify_done(indio_dev->trig);
|
iio_trigger_notify_done(indio_dev->trig);
|
||||||
kfree(rxbuf);
|
kfree(rxbuf);
|
||||||
|
|
|
@ -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,
|
struct ad7606_state *st = container_of(work_s, struct ad7606_state,
|
||||||
poll_work);
|
poll_work);
|
||||||
struct iio_dev *indio_dev = iio_priv_to_dev(st);
|
struct iio_dev *indio_dev = iio_priv_to_dev(st);
|
||||||
struct iio_buffer *ring = indio_dev->buffer;
|
|
||||||
s64 time_ns;
|
s64 time_ns;
|
||||||
__u8 *buf;
|
__u8 *buf;
|
||||||
int ret;
|
int ret;
|
||||||
|
@ -84,7 +83,7 @@ static void ad7606_poll_bh_to_ring(struct work_struct *work_s)
|
||||||
if (indio_dev->scan_timestamp)
|
if (indio_dev->scan_timestamp)
|
||||||
*((s64 *)(buf + indio_dev->scan_bytes - sizeof(s64))) = time_ns;
|
*((s64 *)(buf + indio_dev->scan_bytes - sizeof(s64))) = time_ns;
|
||||||
|
|
||||||
ring->access->store_to(indio_dev->buffer, buf, time_ns);
|
iio_push_to_buffer(indio_dev->buffer, buf, time_ns);
|
||||||
done:
|
done:
|
||||||
gpio_set_value(st->pdata->gpio_convst, 0);
|
gpio_set_value(st->pdata->gpio_convst, 0);
|
||||||
iio_trigger_notify_done(indio_dev->trig);
|
iio_trigger_notify_done(indio_dev->trig);
|
||||||
|
|
|
@ -95,7 +95,7 @@ static irqreturn_t ad7887_trigger_handler(int irq, void *p)
|
||||||
memcpy(buf + indio_dev->scan_bytes - sizeof(s64),
|
memcpy(buf + indio_dev->scan_bytes - sizeof(s64),
|
||||||
&time_ns, sizeof(time_ns));
|
&time_ns, sizeof(time_ns));
|
||||||
|
|
||||||
indio_dev->buffer->access->store_to(indio_dev->buffer, buf, time_ns);
|
iio_push_to_buffer(indio_dev->buffer, buf, time_ns);
|
||||||
done:
|
done:
|
||||||
kfree(buf);
|
kfree(buf);
|
||||||
iio_trigger_notify_done(indio_dev->trig);
|
iio_trigger_notify_done(indio_dev->trig);
|
||||||
|
|
|
@ -35,7 +35,6 @@ static irqreturn_t ad799x_trigger_handler(int irq, void *p)
|
||||||
struct iio_poll_func *pf = p;
|
struct iio_poll_func *pf = p;
|
||||||
struct iio_dev *indio_dev = pf->indio_dev;
|
struct iio_dev *indio_dev = pf->indio_dev;
|
||||||
struct ad799x_state *st = iio_priv(indio_dev);
|
struct ad799x_state *st = iio_priv(indio_dev);
|
||||||
struct iio_buffer *ring = indio_dev->buffer;
|
|
||||||
s64 time_ns;
|
s64 time_ns;
|
||||||
__u8 *rxbuf;
|
__u8 *rxbuf;
|
||||||
int b_sent;
|
int b_sent;
|
||||||
|
@ -78,7 +77,7 @@ static irqreturn_t ad799x_trigger_handler(int irq, void *p)
|
||||||
memcpy(rxbuf + indio_dev->scan_bytes - sizeof(s64),
|
memcpy(rxbuf + indio_dev->scan_bytes - sizeof(s64),
|
||||||
&time_ns, sizeof(time_ns));
|
&time_ns, sizeof(time_ns));
|
||||||
|
|
||||||
ring->access->store_to(indio_dev->buffer, rxbuf, time_ns);
|
iio_push_to_buffer(indio_dev->buffer, rxbuf, time_ns);
|
||||||
done:
|
done:
|
||||||
kfree(rxbuf);
|
kfree(rxbuf);
|
||||||
out:
|
out:
|
||||||
|
|
|
@ -62,7 +62,6 @@ static irqreturn_t adis16260_trigger_handler(int irq, void *p)
|
||||||
struct iio_poll_func *pf = p;
|
struct iio_poll_func *pf = p;
|
||||||
struct iio_dev *indio_dev = pf->indio_dev;
|
struct iio_dev *indio_dev = pf->indio_dev;
|
||||||
struct adis16260_state *st = iio_priv(indio_dev);
|
struct adis16260_state *st = iio_priv(indio_dev);
|
||||||
struct iio_buffer *ring = indio_dev->buffer;
|
|
||||||
int i = 0;
|
int i = 0;
|
||||||
s16 *data;
|
s16 *data;
|
||||||
|
|
||||||
|
@ -82,7 +81,7 @@ static irqreturn_t adis16260_trigger_handler(int irq, void *p)
|
||||||
if (indio_dev->scan_timestamp)
|
if (indio_dev->scan_timestamp)
|
||||||
*((s64 *)(data + ((i + 3)/4)*4)) = pf->timestamp;
|
*((s64 *)(data + ((i + 3)/4)*4)) = pf->timestamp;
|
||||||
|
|
||||||
ring->access->store_to(ring, (u8 *)data, pf->timestamp);
|
iio_push_to_buffer(indio_dev->buffer, (u8 *)data, pf->timestamp);
|
||||||
|
|
||||||
kfree(data);
|
kfree(data);
|
||||||
done:
|
done:
|
||||||
|
|
|
@ -87,7 +87,7 @@ static irqreturn_t iio_simple_dummy_trigger_h(int irq, void *p)
|
||||||
if (indio_dev->scan_timestamp)
|
if (indio_dev->scan_timestamp)
|
||||||
*(s64 *)((u8 *)data + ALIGN(len, sizeof(s64)))
|
*(s64 *)((u8 *)data + ALIGN(len, sizeof(s64)))
|
||||||
= iio_get_time_ns();
|
= iio_get_time_ns();
|
||||||
buffer->access->store_to(buffer, (u8 *)data, pf->timestamp);
|
iio_push_to_buffer(buffer, (u8 *)data, pf->timestamp);
|
||||||
|
|
||||||
kfree(data);
|
kfree(data);
|
||||||
|
|
||||||
|
|
|
@ -678,7 +678,7 @@ static void ad5933_work(struct work_struct *work)
|
||||||
buf[0] = be16_to_cpu(buf[0]);
|
buf[0] = be16_to_cpu(buf[0]);
|
||||||
}
|
}
|
||||||
/* save datum to the ring */
|
/* save datum to the ring */
|
||||||
ring->access->store_to(ring, (u8 *)buf, iio_get_time_ns());
|
iio_push_to_buffer(ring, (u8 *)buf, iio_get_time_ns());
|
||||||
} else {
|
} else {
|
||||||
/* no data available - try again later */
|
/* no data available - try again later */
|
||||||
schedule_delayed_work(&st->work, st->poll_time_jiffies);
|
schedule_delayed_work(&st->work, st->poll_time_jiffies);
|
||||||
|
|
|
@ -150,7 +150,7 @@ static irqreturn_t adis16400_trigger_handler(int irq, void *p)
|
||||||
/* Guaranteed to be aligned with 8 byte boundary */
|
/* Guaranteed to be aligned with 8 byte boundary */
|
||||||
if (ring->scan_timestamp)
|
if (ring->scan_timestamp)
|
||||||
*((s64 *)(data + ((i + 3)/4)*4)) = pf->timestamp;
|
*((s64 *)(data + ((i + 3)/4)*4)) = pf->timestamp;
|
||||||
ring->access->store_to(indio_dev->buffer, (u8 *) data, pf->timestamp);
|
iio_push_to_buffer(ring, (u8 *) data, pf->timestamp);
|
||||||
|
|
||||||
done:
|
done:
|
||||||
kfree(data);
|
kfree(data);
|
||||||
|
|
|
@ -61,7 +61,6 @@ static irqreturn_t ade7758_trigger_handler(int irq, void *p)
|
||||||
{
|
{
|
||||||
struct iio_poll_func *pf = p;
|
struct iio_poll_func *pf = p;
|
||||||
struct iio_dev *indio_dev = pf->indio_dev;
|
struct iio_dev *indio_dev = pf->indio_dev;
|
||||||
struct iio_buffer *ring = indio_dev->buffer;
|
|
||||||
struct ade7758_state *st = iio_priv(indio_dev);
|
struct ade7758_state *st = iio_priv(indio_dev);
|
||||||
s64 dat64[2];
|
s64 dat64[2];
|
||||||
u32 *dat32 = (u32 *)dat64;
|
u32 *dat32 = (u32 *)dat64;
|
||||||
|
@ -74,7 +73,7 @@ static irqreturn_t ade7758_trigger_handler(int irq, void *p)
|
||||||
if (indio_dev->scan_timestamp)
|
if (indio_dev->scan_timestamp)
|
||||||
dat64[1] = pf->timestamp;
|
dat64[1] = pf->timestamp;
|
||||||
|
|
||||||
ring->access->store_to(ring, (u8 *)dat64, pf->timestamp);
|
iio_push_to_buffer(indio_dev->buffer, (u8 *)dat64, pf->timestamp);
|
||||||
|
|
||||||
iio_trigger_notify_done(indio_dev->trig);
|
iio_trigger_notify_done(indio_dev->trig);
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue