* [PATCH] staging:iio: Use iio_push_to_buffer @ 2012-09-04 11:31 Lars-Peter Clausen 2012-09-04 11:33 ` Lars-Peter Clausen 2012-09-04 11:35 ` [PATCH v2] " Lars-Peter Clausen 0 siblings, 2 replies; 8+ messages in thread From: Lars-Peter Clausen @ 2012-09-04 11:31 UTC (permalink / raw) To: Jonathan Cameron; +Cc: linux-iio, Lars-Peter Clausen Consistently use iio_push_to_buffer instead of manually calling the buffers store_to callback. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> --- drivers/staging/iio/accel/adis16201_ring.c | 3 +-- drivers/staging/iio/accel/adis16203_ring.c | 5 +---- drivers/staging/iio/accel/adis16204_ring.c | 3 +-- drivers/staging/iio/accel/adis16209_ring.c | 3 +-- drivers/staging/iio/accel/adis16240_ring.c | 3 +-- drivers/staging/iio/accel/lis3l02dq_ring.c | 3 +-- drivers/staging/iio/adc/ad7192.c | 3 +-- drivers/staging/iio/adc/ad7298_ring.c | 3 +-- drivers/staging/iio/adc/ad7476_ring.c | 2 +- drivers/staging/iio/adc/ad7606_ring.c | 3 +-- drivers/staging/iio/adc/ad7793.c | 3 +-- drivers/staging/iio/adc/ad7887_ring.c | 2 +- drivers/staging/iio/adc/ad799x_ring.c | 3 +-- drivers/staging/iio/gyro/adis16260_ring.c | 3 +-- drivers/staging/iio/iio_simple_dummy_buffer.c | 2 +- drivers/staging/iio/impedance-analyzer/ad5933.c | 2 +- drivers/staging/iio/imu/adis16400_ring.c | 2 +- drivers/staging/iio/meter/ade7758_ring.c | 3 +-- 18 files changed, 18 insertions(+), 33 deletions(-) diff --git a/drivers/staging/iio/accel/adis16201_ring.c b/drivers/staging/iio/accel/adis16201_ring.c index 03fcf6e..884dcf8 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) struct iio_poll_func *pf = p; struct iio_dev *indio_dev = pf->indio_dev; struct adis16201_state *st = iio_priv(indio_dev); - struct iio_buffer *ring = indio_dev->buffer; int i = 0; s16 *data; @@ -83,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; - ring->access->store_to(ring, (u8 *)data, pf->timestamp); + iio_push_to_buffer(indio_dev->buffer, (u8 *)data, pf->timestamp); kfree(data); done: diff --git a/drivers/staging/iio/accel/adis16203_ring.c b/drivers/staging/iio/accel/adis16203_ring.c index c16b2b7..a7ff804 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) struct iio_poll_func *pf = p; struct iio_dev *indio_dev = pf->indio_dev; struct adis16203_state *st = iio_priv(indio_dev); - struct iio_buffer *ring = indio_dev->buffer; int i = 0; s16 *data; @@ -82,9 +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; - ring->access->store_to(ring, - (u8 *)data, - pf->timestamp); + iio_push_to_buffer(indio_dev->buffer, (u8 *)data, pf->timestamp); kfree(data); done: diff --git a/drivers/staging/iio/accel/adis16204_ring.c b/drivers/staging/iio/accel/adis16204_ring.c index 1d2b31c..16e36e3 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) struct iio_poll_func *pf = p; struct iio_dev *indio_dev = pf->indio_dev; struct adis16204_state *st = iio_priv(indio_dev); - struct iio_buffer *ring = indio_dev->buffer; int i = 0; s16 *data; @@ -79,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; - ring->access->store_to(ring, (u8 *)data, pf->timestamp); + iio_push_to_buffer(indio_dev->buffer, (u8 *)data, pf->timestamp); kfree(data); done: diff --git a/drivers/staging/iio/accel/adis16209_ring.c b/drivers/staging/iio/accel/adis16209_ring.c index 1a4a55c..5cfeff4 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) struct iio_poll_func *pf = p; struct iio_dev *indio_dev = pf->indio_dev; struct adis16209_state *st = iio_priv(indio_dev); - struct iio_buffer *ring = indio_dev->buffer; int i = 0; s16 *data; @@ -79,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; - ring->access->store_to(ring, (u8 *)data, pf->timestamp); + iio_push_to_buffer(indio_dev->buffer, (u8 *)data, pf->timestamp); kfree(data); done: diff --git a/drivers/staging/iio/accel/adis16240_ring.c b/drivers/staging/iio/accel/adis16240_ring.c index 360dfed..d5ec43e 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) struct iio_poll_func *pf = p; struct iio_dev *indio_dev = pf->indio_dev; struct adis16240_state *st = iio_priv(indio_dev); - struct iio_buffer *ring = indio_dev->buffer; int i = 0; s16 *data; @@ -77,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; - ring->access->store_to(ring, (u8 *)data, pf->timestamp); + iio_push_to_buffer(indio_dev->buffer, (u8 *)data, pf->timestamp); kfree(data); done: diff --git a/drivers/staging/iio/accel/lis3l02dq_ring.c b/drivers/staging/iio/accel/lis3l02dq_ring.c index 18d108f..a47f15b 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) { struct iio_poll_func *pf = p; struct iio_dev *indio_dev = pf->indio_dev; - struct iio_buffer *buffer = indio_dev->buffer; int len = 0; char *data; @@ -153,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; - buffer->access->store_to(buffer, (u8 *)data, pf->timestamp); + iio_push_to_buffer(indio_dev->buffer, (u8 *)data, pf->timestamp); kfree(data); done: diff --git a/drivers/staging/iio/adc/ad7192.c b/drivers/staging/iio/adc/ad7192.c index 405d9a8..d91b96f 100644 --- a/drivers/staging/iio/adc/ad7192.c +++ b/drivers/staging/iio/adc/ad7192.c @@ -509,7 +509,6 @@ static irqreturn_t ad7192_trigger_handler(int irq, void *p) { struct iio_poll_func *pf = p; struct iio_dev *indio_dev = pf->indio_dev; - struct iio_buffer *ring = indio_dev->buffer; struct ad7192_state *st = iio_priv(indio_dev); s64 dat64[2]; s32 *dat32 = (s32 *)dat64; @@ -523,7 +522,7 @@ static irqreturn_t ad7192_trigger_handler(int irq, void *p) if (indio_dev->scan_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); st->irq_dis = false; diff --git a/drivers/staging/iio/adc/ad7298_ring.c b/drivers/staging/iio/adc/ad7298_ring.c index 506016f..9fce404 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) struct iio_poll_func *pf = p; struct iio_dev *indio_dev = pf->indio_dev; struct ad7298_state *st = iio_priv(indio_dev); - struct iio_buffer *ring = indio_dev->buffer; s64 time_ns = 0; __u16 buf[16]; int b_sent, i; @@ -94,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]); - indio_dev->buffer->access->store_to(ring, (u8 *)buf, time_ns); + iio_push_to_buffer(indio_dev->buffer, (u8 *)buf, time_ns); 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 d087b21..3741ac6 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)); - indio_dev->buffer->access->store_to(indio_dev->buffer, rxbuf, time_ns); + iio_push_to_buffer(indio_dev->buffer, rxbuf, time_ns); 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 f15afe4..f4b009e 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) struct ad7606_state *st = container_of(work_s, struct ad7606_state, poll_work); struct iio_dev *indio_dev = iio_priv_to_dev(st); - struct iio_buffer *ring = indio_dev->buffer; s64 time_ns; __u8 *buf; int ret; @@ -84,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; - ring->access->store_to(indio_dev->buffer, buf, time_ns); + iio_push_to_buffer(indio_dev->buffer, buf, time_ns); done: gpio_set_value(st->pdata->gpio_convst, 0); iio_trigger_notify_done(indio_dev->trig); diff --git a/drivers/staging/iio/adc/ad7793.c b/drivers/staging/iio/adc/ad7793.c index 112e2b7..f6301a2 100644 --- a/drivers/staging/iio/adc/ad7793.c +++ b/drivers/staging/iio/adc/ad7793.c @@ -374,7 +374,6 @@ static irqreturn_t ad7793_trigger_handler(int irq, void *p) { struct iio_poll_func *pf = p; struct iio_dev *indio_dev = pf->indio_dev; - struct iio_buffer *ring = indio_dev->buffer; struct ad7793_state *st = iio_priv(indio_dev); s64 dat64[2]; s32 *dat32 = (s32 *)dat64; @@ -388,7 +387,7 @@ static irqreturn_t ad7793_trigger_handler(int irq, void *p) if (indio_dev->scan_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); st->irq_dis = false; diff --git a/drivers/staging/iio/adc/ad7887_ring.c b/drivers/staging/iio/adc/ad7887_ring.c index c76fdb5..a4ff493 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)); - indio_dev->buffer->access->store_to(indio_dev->buffer, buf, time_ns); + iio_push_to_buffer(indio_dev->buffer, buf, time_ns); 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 858a685..84275c3 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) struct iio_poll_func *pf = p; struct iio_dev *indio_dev = pf->indio_dev; struct ad799x_state *st = iio_priv(indio_dev); - struct iio_buffer *ring = indio_dev->buffer; s64 time_ns; __u8 *rxbuf; 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), &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: kfree(rxbuf); out: diff --git a/drivers/staging/iio/gyro/adis16260_ring.c b/drivers/staging/iio/gyro/adis16260_ring.c index eeee8e7..e6e2345 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) struct iio_poll_func *pf = p; struct iio_dev *indio_dev = pf->indio_dev; struct adis16260_state *st = iio_priv(indio_dev); - struct iio_buffer *ring = indio_dev->buffer; int i = 0; s16 *data; @@ -82,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; - ring->access->store_to(ring, (u8 *)data, pf->timestamp); + iio_push_to_buffer(indio_dev->buffer, (u8 *)data, pf->timestamp); kfree(data); done: diff --git a/drivers/staging/iio/iio_simple_dummy_buffer.c b/drivers/staging/iio/iio_simple_dummy_buffer.c index bd628de..e080213 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(); - buffer->access->store_to(buffer, (u8 *)data, pf->timestamp); + iio_push_to_buffer(buffer, (u8 *)data, pf->timestamp); kfree(data); diff --git a/drivers/staging/iio/impedance-analyzer/ad5933.c b/drivers/staging/iio/impedance-analyzer/ad5933.c index e239ea9..39a9be8 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 */ - ring->access->store_to(ring, (u8 *)buf, iio_get_time_ns()); + iio_push_to_buffer(ring, (u8 *)buf, iio_get_time_ns()); } 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 beec650..6b71788 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; - ring->access->store_to(indio_dev->buffer, (u8 *) data, pf->timestamp); + iio_push_to_buffer(ring, (u8 *) data, pf->timestamp); done: kfree(data); diff --git a/drivers/staging/iio/meter/ade7758_ring.c b/drivers/staging/iio/meter/ade7758_ring.c index 1ce10b2..23c107a 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) { struct iio_poll_func *pf = p; struct iio_dev *indio_dev = pf->indio_dev; - struct iio_buffer *ring = indio_dev->buffer; struct ade7758_state *st = iio_priv(indio_dev); s64 dat64[2]; u32 *dat32 = (u32 *)dat64; @@ -74,7 +73,7 @@ static irqreturn_t ade7758_trigger_handler(int irq, void *p) if (indio_dev->scan_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); -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH] staging:iio: Use iio_push_to_buffer 2012-09-04 11:31 [PATCH] staging:iio: Use iio_push_to_buffer Lars-Peter Clausen @ 2012-09-04 11:33 ` Lars-Peter Clausen 2012-09-04 11:35 ` [PATCH v2] " Lars-Peter Clausen 1 sibling, 0 replies; 8+ messages in thread From: Lars-Peter Clausen @ 2012-09-04 11:33 UTC (permalink / raw) To: Lars-Peter Clausen; +Cc: Jonathan Cameron, linux-iio On 09/04/2012 01:31 PM, Lars-Peter Clausen wrote: > Consistently use iio_push_to_buffer instead of manually calling the buffers > store_to callback. > Ignore this one. It's an outdated version of the patch... > Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> > --- > drivers/staging/iio/accel/adis16201_ring.c | 3 +-- > drivers/staging/iio/accel/adis16203_ring.c | 5 +---- > drivers/staging/iio/accel/adis16204_ring.c | 3 +-- > drivers/staging/iio/accel/adis16209_ring.c | 3 +-- > drivers/staging/iio/accel/adis16240_ring.c | 3 +-- > drivers/staging/iio/accel/lis3l02dq_ring.c | 3 +-- > drivers/staging/iio/adc/ad7192.c | 3 +-- > drivers/staging/iio/adc/ad7298_ring.c | 3 +-- > drivers/staging/iio/adc/ad7476_ring.c | 2 +- > drivers/staging/iio/adc/ad7606_ring.c | 3 +-- > drivers/staging/iio/adc/ad7793.c | 3 +-- > drivers/staging/iio/adc/ad7887_ring.c | 2 +- > drivers/staging/iio/adc/ad799x_ring.c | 3 +-- > drivers/staging/iio/gyro/adis16260_ring.c | 3 +-- > drivers/staging/iio/iio_simple_dummy_buffer.c | 2 +- > drivers/staging/iio/impedance-analyzer/ad5933.c | 2 +- > drivers/staging/iio/imu/adis16400_ring.c | 2 +- > drivers/staging/iio/meter/ade7758_ring.c | 3 +-- > 18 files changed, 18 insertions(+), 33 deletions(-) > > diff --git a/drivers/staging/iio/accel/adis16201_ring.c b/drivers/staging/iio/accel/adis16201_ring.c > index 03fcf6e..884dcf8 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) > struct iio_poll_func *pf = p; > struct iio_dev *indio_dev = pf->indio_dev; > struct adis16201_state *st = iio_priv(indio_dev); > - struct iio_buffer *ring = indio_dev->buffer; > > int i = 0; > s16 *data; > @@ -83,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; > > - ring->access->store_to(ring, (u8 *)data, pf->timestamp); > + iio_push_to_buffer(indio_dev->buffer, (u8 *)data, pf->timestamp); > > kfree(data); > done: > diff --git a/drivers/staging/iio/accel/adis16203_ring.c b/drivers/staging/iio/accel/adis16203_ring.c > index c16b2b7..a7ff804 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) > struct iio_poll_func *pf = p; > struct iio_dev *indio_dev = pf->indio_dev; > struct adis16203_state *st = iio_priv(indio_dev); > - struct iio_buffer *ring = indio_dev->buffer; > > int i = 0; > s16 *data; > @@ -82,9 +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; > > - ring->access->store_to(ring, > - (u8 *)data, > - pf->timestamp); > + iio_push_to_buffer(indio_dev->buffer, (u8 *)data, pf->timestamp); > > kfree(data); > done: > diff --git a/drivers/staging/iio/accel/adis16204_ring.c b/drivers/staging/iio/accel/adis16204_ring.c > index 1d2b31c..16e36e3 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) > struct iio_poll_func *pf = p; > struct iio_dev *indio_dev = pf->indio_dev; > struct adis16204_state *st = iio_priv(indio_dev); > - struct iio_buffer *ring = indio_dev->buffer; > int i = 0; > s16 *data; > > @@ -79,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; > > - ring->access->store_to(ring, (u8 *)data, pf->timestamp); > + iio_push_to_buffer(indio_dev->buffer, (u8 *)data, pf->timestamp); > > kfree(data); > done: > diff --git a/drivers/staging/iio/accel/adis16209_ring.c b/drivers/staging/iio/accel/adis16209_ring.c > index 1a4a55c..5cfeff4 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) > struct iio_poll_func *pf = p; > struct iio_dev *indio_dev = pf->indio_dev; > struct adis16209_state *st = iio_priv(indio_dev); > - struct iio_buffer *ring = indio_dev->buffer; > int i = 0; > s16 *data; > > @@ -79,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; > > - ring->access->store_to(ring, (u8 *)data, pf->timestamp); > + iio_push_to_buffer(indio_dev->buffer, (u8 *)data, pf->timestamp); > > kfree(data); > done: > diff --git a/drivers/staging/iio/accel/adis16240_ring.c b/drivers/staging/iio/accel/adis16240_ring.c > index 360dfed..d5ec43e 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) > struct iio_poll_func *pf = p; > struct iio_dev *indio_dev = pf->indio_dev; > struct adis16240_state *st = iio_priv(indio_dev); > - struct iio_buffer *ring = indio_dev->buffer; > > int i = 0; > s16 *data; > @@ -77,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; > > - ring->access->store_to(ring, (u8 *)data, pf->timestamp); > + iio_push_to_buffer(indio_dev->buffer, (u8 *)data, pf->timestamp); > > kfree(data); > done: > diff --git a/drivers/staging/iio/accel/lis3l02dq_ring.c b/drivers/staging/iio/accel/lis3l02dq_ring.c > index 18d108f..a47f15b 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) > { > struct iio_poll_func *pf = p; > struct iio_dev *indio_dev = pf->indio_dev; > - struct iio_buffer *buffer = indio_dev->buffer; > int len = 0; > char *data; > > @@ -153,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; > - buffer->access->store_to(buffer, (u8 *)data, pf->timestamp); > + iio_push_to_buffer(indio_dev->buffer, (u8 *)data, pf->timestamp); > > kfree(data); > done: > diff --git a/drivers/staging/iio/adc/ad7192.c b/drivers/staging/iio/adc/ad7192.c > index 405d9a8..d91b96f 100644 > --- a/drivers/staging/iio/adc/ad7192.c > +++ b/drivers/staging/iio/adc/ad7192.c > @@ -509,7 +509,6 @@ static irqreturn_t ad7192_trigger_handler(int irq, void *p) > { > struct iio_poll_func *pf = p; > struct iio_dev *indio_dev = pf->indio_dev; > - struct iio_buffer *ring = indio_dev->buffer; > struct ad7192_state *st = iio_priv(indio_dev); > s64 dat64[2]; > s32 *dat32 = (s32 *)dat64; > @@ -523,7 +522,7 @@ static irqreturn_t ad7192_trigger_handler(int irq, void *p) > if (indio_dev->scan_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); > st->irq_dis = false; > diff --git a/drivers/staging/iio/adc/ad7298_ring.c b/drivers/staging/iio/adc/ad7298_ring.c > index 506016f..9fce404 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) > struct iio_poll_func *pf = p; > struct iio_dev *indio_dev = pf->indio_dev; > struct ad7298_state *st = iio_priv(indio_dev); > - struct iio_buffer *ring = indio_dev->buffer; > s64 time_ns = 0; > __u16 buf[16]; > int b_sent, i; > @@ -94,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]); > > - indio_dev->buffer->access->store_to(ring, (u8 *)buf, time_ns); > + iio_push_to_buffer(indio_dev->buffer, (u8 *)buf, time_ns); > > 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 d087b21..3741ac6 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)); > > - indio_dev->buffer->access->store_to(indio_dev->buffer, rxbuf, time_ns); > + iio_push_to_buffer(indio_dev->buffer, rxbuf, time_ns); > 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 f15afe4..f4b009e 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) > struct ad7606_state *st = container_of(work_s, struct ad7606_state, > poll_work); > struct iio_dev *indio_dev = iio_priv_to_dev(st); > - struct iio_buffer *ring = indio_dev->buffer; > s64 time_ns; > __u8 *buf; > int ret; > @@ -84,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; > > - ring->access->store_to(indio_dev->buffer, buf, time_ns); > + iio_push_to_buffer(indio_dev->buffer, buf, time_ns); > done: > gpio_set_value(st->pdata->gpio_convst, 0); > iio_trigger_notify_done(indio_dev->trig); > diff --git a/drivers/staging/iio/adc/ad7793.c b/drivers/staging/iio/adc/ad7793.c > index 112e2b7..f6301a2 100644 > --- a/drivers/staging/iio/adc/ad7793.c > +++ b/drivers/staging/iio/adc/ad7793.c > @@ -374,7 +374,6 @@ static irqreturn_t ad7793_trigger_handler(int irq, void *p) > { > struct iio_poll_func *pf = p; > struct iio_dev *indio_dev = pf->indio_dev; > - struct iio_buffer *ring = indio_dev->buffer; > struct ad7793_state *st = iio_priv(indio_dev); > s64 dat64[2]; > s32 *dat32 = (s32 *)dat64; > @@ -388,7 +387,7 @@ static irqreturn_t ad7793_trigger_handler(int irq, void *p) > if (indio_dev->scan_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); > st->irq_dis = false; > diff --git a/drivers/staging/iio/adc/ad7887_ring.c b/drivers/staging/iio/adc/ad7887_ring.c > index c76fdb5..a4ff493 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)); > > - indio_dev->buffer->access->store_to(indio_dev->buffer, buf, time_ns); > + iio_push_to_buffer(indio_dev->buffer, buf, time_ns); > 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 858a685..84275c3 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) > struct iio_poll_func *pf = p; > struct iio_dev *indio_dev = pf->indio_dev; > struct ad799x_state *st = iio_priv(indio_dev); > - struct iio_buffer *ring = indio_dev->buffer; > s64 time_ns; > __u8 *rxbuf; > 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), > &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: > kfree(rxbuf); > out: > diff --git a/drivers/staging/iio/gyro/adis16260_ring.c b/drivers/staging/iio/gyro/adis16260_ring.c > index eeee8e7..e6e2345 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) > struct iio_poll_func *pf = p; > struct iio_dev *indio_dev = pf->indio_dev; > struct adis16260_state *st = iio_priv(indio_dev); > - struct iio_buffer *ring = indio_dev->buffer; > int i = 0; > s16 *data; > > @@ -82,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; > > - ring->access->store_to(ring, (u8 *)data, pf->timestamp); > + iio_push_to_buffer(indio_dev->buffer, (u8 *)data, pf->timestamp); > > kfree(data); > done: > diff --git a/drivers/staging/iio/iio_simple_dummy_buffer.c b/drivers/staging/iio/iio_simple_dummy_buffer.c > index bd628de..e080213 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(); > - buffer->access->store_to(buffer, (u8 *)data, pf->timestamp); > + iio_push_to_buffer(buffer, (u8 *)data, pf->timestamp); > > kfree(data); > > diff --git a/drivers/staging/iio/impedance-analyzer/ad5933.c b/drivers/staging/iio/impedance-analyzer/ad5933.c > index e239ea9..39a9be8 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 */ > - ring->access->store_to(ring, (u8 *)buf, iio_get_time_ns()); > + iio_push_to_buffer(ring, (u8 *)buf, iio_get_time_ns()); > } 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 beec650..6b71788 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; > - ring->access->store_to(indio_dev->buffer, (u8 *) data, pf->timestamp); > + iio_push_to_buffer(ring, (u8 *) data, pf->timestamp); > > done: > kfree(data); > diff --git a/drivers/staging/iio/meter/ade7758_ring.c b/drivers/staging/iio/meter/ade7758_ring.c > index 1ce10b2..23c107a 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) > { > struct iio_poll_func *pf = p; > struct iio_dev *indio_dev = pf->indio_dev; > - struct iio_buffer *ring = indio_dev->buffer; > struct ade7758_state *st = iio_priv(indio_dev); > s64 dat64[2]; > u32 *dat32 = (u32 *)dat64; > @@ -74,7 +73,7 @@ static irqreturn_t ade7758_trigger_handler(int irq, void *p) > if (indio_dev->scan_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); > ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v2] staging:iio: Use iio_push_to_buffer 2012-09-04 11:31 [PATCH] staging:iio: Use iio_push_to_buffer Lars-Peter Clausen 2012-09-04 11:33 ` Lars-Peter Clausen @ 2012-09-04 11:35 ` Lars-Peter Clausen 2012-09-04 11:48 ` Peter Meerwald 1 sibling, 1 reply; 8+ messages in thread From: Lars-Peter Clausen @ 2012-09-04 11:35 UTC (permalink / raw) To: Jonathan Cameron; +Cc: linux-iio, Lars-Peter Clausen Consistently use iio_push_to_buffer instead of manually calling the buffers store_to callback. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> --- drivers/staging/iio/accel/adis16201_ring.c | 3 +-- drivers/staging/iio/accel/adis16203_ring.c | 5 +---- drivers/staging/iio/accel/adis16204_ring.c | 3 +-- drivers/staging/iio/accel/adis16209_ring.c | 3 +-- drivers/staging/iio/accel/adis16240_ring.c | 3 +-- drivers/staging/iio/accel/lis3l02dq_ring.c | 3 +-- drivers/staging/iio/adc/ad7298_ring.c | 3 +-- drivers/staging/iio/adc/ad7476_ring.c | 2 +- drivers/staging/iio/adc/ad7606_ring.c | 3 +-- drivers/staging/iio/adc/ad7887_ring.c | 2 +- drivers/staging/iio/adc/ad799x_ring.c | 3 +-- drivers/staging/iio/gyro/adis16260_ring.c | 3 +-- drivers/staging/iio/iio_simple_dummy_buffer.c | 2 +- drivers/staging/iio/impedance-analyzer/ad5933.c | 2 +- drivers/staging/iio/imu/adis16400_ring.c | 2 +- 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 03fcf6e..884dcf8 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) struct iio_poll_func *pf = p; struct iio_dev *indio_dev = pf->indio_dev; struct adis16201_state *st = iio_priv(indio_dev); - struct iio_buffer *ring = indio_dev->buffer; int i = 0; s16 *data; @@ -83,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; - ring->access->store_to(ring, (u8 *)data, pf->timestamp); + iio_push_to_buffer(indio_dev->buffer, (u8 *)data, pf->timestamp); kfree(data); done: diff --git a/drivers/staging/iio/accel/adis16203_ring.c b/drivers/staging/iio/accel/adis16203_ring.c index c16b2b7..a7ff804 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) struct iio_poll_func *pf = p; struct iio_dev *indio_dev = pf->indio_dev; struct adis16203_state *st = iio_priv(indio_dev); - struct iio_buffer *ring = indio_dev->buffer; int i = 0; s16 *data; @@ -82,9 +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; - ring->access->store_to(ring, - (u8 *)data, - pf->timestamp); + iio_push_to_buffer(indio_dev->buffer, (u8 *)data, pf->timestamp); kfree(data); done: diff --git a/drivers/staging/iio/accel/adis16204_ring.c b/drivers/staging/iio/accel/adis16204_ring.c index 1d2b31c..16e36e3 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) struct iio_poll_func *pf = p; struct iio_dev *indio_dev = pf->indio_dev; struct adis16204_state *st = iio_priv(indio_dev); - struct iio_buffer *ring = indio_dev->buffer; int i = 0; s16 *data; @@ -79,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; - ring->access->store_to(ring, (u8 *)data, pf->timestamp); + iio_push_to_buffer(indio_dev->buffer, (u8 *)data, pf->timestamp); kfree(data); done: diff --git a/drivers/staging/iio/accel/adis16209_ring.c b/drivers/staging/iio/accel/adis16209_ring.c index 1a4a55c..5cfeff4 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) struct iio_poll_func *pf = p; struct iio_dev *indio_dev = pf->indio_dev; struct adis16209_state *st = iio_priv(indio_dev); - struct iio_buffer *ring = indio_dev->buffer; int i = 0; s16 *data; @@ -79,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; - ring->access->store_to(ring, (u8 *)data, pf->timestamp); + iio_push_to_buffer(indio_dev->buffer, (u8 *)data, pf->timestamp); kfree(data); done: diff --git a/drivers/staging/iio/accel/adis16240_ring.c b/drivers/staging/iio/accel/adis16240_ring.c index 360dfed..d5ec43e 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) struct iio_poll_func *pf = p; struct iio_dev *indio_dev = pf->indio_dev; struct adis16240_state *st = iio_priv(indio_dev); - struct iio_buffer *ring = indio_dev->buffer; int i = 0; s16 *data; @@ -77,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; - ring->access->store_to(ring, (u8 *)data, pf->timestamp); + iio_push_to_buffer(indio_dev->buffer, (u8 *)data, pf->timestamp); kfree(data); done: diff --git a/drivers/staging/iio/accel/lis3l02dq_ring.c b/drivers/staging/iio/accel/lis3l02dq_ring.c index 7da2703..9332762 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) { struct iio_poll_func *pf = p; struct iio_dev *indio_dev = pf->indio_dev; - struct iio_buffer *buffer = indio_dev->buffer; int len = 0; char *data; @@ -153,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; - buffer->access->store_to(buffer, (u8 *)data, pf->timestamp); + iio_push_to_buffer(indio_dev->buffer, (u8 *)data, pf->timestamp); kfree(data); done: diff --git a/drivers/staging/iio/adc/ad7298_ring.c b/drivers/staging/iio/adc/ad7298_ring.c index 506016f..9fce404 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) struct iio_poll_func *pf = p; struct iio_dev *indio_dev = pf->indio_dev; struct ad7298_state *st = iio_priv(indio_dev); - struct iio_buffer *ring = indio_dev->buffer; s64 time_ns = 0; __u16 buf[16]; int b_sent, i; @@ -94,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]); - indio_dev->buffer->access->store_to(ring, (u8 *)buf, time_ns); + iio_push_to_buffer(indio_dev->buffer, (u8 *)buf, time_ns); 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 d087b21..3741ac6 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)); - indio_dev->buffer->access->store_to(indio_dev->buffer, rxbuf, time_ns); + iio_push_to_buffer(indio_dev->buffer, rxbuf, time_ns); 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 f15afe4..f4b009e 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) struct ad7606_state *st = container_of(work_s, struct ad7606_state, poll_work); struct iio_dev *indio_dev = iio_priv_to_dev(st); - struct iio_buffer *ring = indio_dev->buffer; s64 time_ns; __u8 *buf; int ret; @@ -84,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; - ring->access->store_to(indio_dev->buffer, buf, time_ns); + iio_push_to_buffer(indio_dev->buffer, buf, time_ns); 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 c76fdb5..a4ff493 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)); - indio_dev->buffer->access->store_to(indio_dev->buffer, buf, time_ns); + iio_push_to_buffer(indio_dev->buffer, buf, time_ns); 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 858a685..84275c3 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) struct iio_poll_func *pf = p; struct iio_dev *indio_dev = pf->indio_dev; struct ad799x_state *st = iio_priv(indio_dev); - struct iio_buffer *ring = indio_dev->buffer; s64 time_ns; __u8 *rxbuf; 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), &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: kfree(rxbuf); out: diff --git a/drivers/staging/iio/gyro/adis16260_ring.c b/drivers/staging/iio/gyro/adis16260_ring.c index eeee8e7..e6e2345 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) struct iio_poll_func *pf = p; struct iio_dev *indio_dev = pf->indio_dev; struct adis16260_state *st = iio_priv(indio_dev); - struct iio_buffer *ring = indio_dev->buffer; int i = 0; s16 *data; @@ -82,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; - ring->access->store_to(ring, (u8 *)data, pf->timestamp); + iio_push_to_buffer(indio_dev->buffer, (u8 *)data, pf->timestamp); kfree(data); done: diff --git a/drivers/staging/iio/iio_simple_dummy_buffer.c b/drivers/staging/iio/iio_simple_dummy_buffer.c index bd628de..e080213 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(); - buffer->access->store_to(buffer, (u8 *)data, pf->timestamp); + iio_push_to_buffer(buffer, (u8 *)data, pf->timestamp); kfree(data); diff --git a/drivers/staging/iio/impedance-analyzer/ad5933.c b/drivers/staging/iio/impedance-analyzer/ad5933.c index e239ea9..39a9be8 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 */ - ring->access->store_to(ring, (u8 *)buf, iio_get_time_ns()); + iio_push_to_buffer(ring, (u8 *)buf, iio_get_time_ns()); } 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 beec650..6b71788 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; - ring->access->store_to(indio_dev->buffer, (u8 *) data, pf->timestamp); + iio_push_to_buffer(ring, (u8 *) data, pf->timestamp); done: kfree(data); diff --git a/drivers/staging/iio/meter/ade7758_ring.c b/drivers/staging/iio/meter/ade7758_ring.c index 1ce10b2..23c107a 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) { struct iio_poll_func *pf = p; struct iio_dev *indio_dev = pf->indio_dev; - struct iio_buffer *ring = indio_dev->buffer; struct ade7758_state *st = iio_priv(indio_dev); s64 dat64[2]; u32 *dat32 = (u32 *)dat64; @@ -74,7 +73,7 @@ static irqreturn_t ade7758_trigger_handler(int irq, void *p) if (indio_dev->scan_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); -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH v2] staging:iio: Use iio_push_to_buffer 2012-09-04 11:35 ` [PATCH v2] " Lars-Peter Clausen @ 2012-09-04 11:48 ` Peter Meerwald 2012-09-04 11:59 ` Jonathan Cameron 0 siblings, 1 reply; 8+ messages in thread From: Peter Meerwald @ 2012-09-04 11:48 UTC (permalink / raw) To: Lars-Peter Clausen; +Cc: Jonathan Cameron, linux-iio > Consistently use iio_push_to_buffer instead of manually calling the buffers > store_to callback. can we kill the timestamp parameter as an add-on patch? thanks, p. -- Peter Meerwald +43-664-2444418 (mobile) ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v2] staging:iio: Use iio_push_to_buffer 2012-09-04 11:48 ` Peter Meerwald @ 2012-09-04 11:59 ` Jonathan Cameron 2012-09-04 12:38 ` [PATCH] iio: Drop timestamp parameter from buffer store_to callback Lars-Peter Clausen 0 siblings, 1 reply; 8+ messages in thread From: Jonathan Cameron @ 2012-09-04 11:59 UTC (permalink / raw) To: Peter Meerwald; +Cc: Lars-Peter Clausen, Jonathan Cameron, linux-iio On 04/09/12 12:48, Peter Meerwald wrote: > >> Consistently use iio_push_to_buffer instead of manually calling the buffers >> store_to callback. > > can we kill the timestamp parameter as an add-on patch? > > thanks, p. > Seems reasonable to me. Jonathan ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH] iio: Drop timestamp parameter from buffer store_to callback 2012-09-04 11:59 ` Jonathan Cameron @ 2012-09-04 12:38 ` Lars-Peter Clausen 2012-09-06 21:21 ` Jonathan Cameron 0 siblings, 1 reply; 8+ messages in thread From: Lars-Peter Clausen @ 2012-09-04 12:38 UTC (permalink / raw) To: Jonathan Cameron; +Cc: linux-iio, Lars-Peter Clausen Drop timestamp parameter from buffer store_to callback and subsequently from iio_push_to_buffer. The timestamp parameter is unused and it seems likely that it will stay unused in the future, so it should be safe to remove it. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> --- drivers/iio/adc/ad7266.c | 2 +- drivers/iio/adc/ad_sigma_delta.c | 2 +- drivers/iio/adc/at91_adc.c | 2 +- drivers/iio/industrialio-buffer.c | 5 ++--- drivers/iio/kfifo_buf.c | 3 +-- drivers/iio/light/adjd_s311.c | 2 +- drivers/staging/iio/accel/adis16201_ring.c | 2 +- drivers/staging/iio/accel/adis16203_ring.c | 2 +- drivers/staging/iio/accel/adis16204_ring.c | 2 +- drivers/staging/iio/accel/adis16209_ring.c | 2 +- drivers/staging/iio/accel/adis16240_ring.c | 2 +- drivers/staging/iio/accel/lis3l02dq_ring.c | 2 +- drivers/staging/iio/adc/ad7298_ring.c | 2 +- drivers/staging/iio/adc/ad7476_ring.c | 2 +- drivers/staging/iio/adc/ad7606_ring.c | 2 +- drivers/staging/iio/adc/ad7887_ring.c | 2 +- drivers/staging/iio/adc/ad799x_ring.c | 2 +- drivers/staging/iio/adc/max1363_ring.c | 2 +- drivers/staging/iio/adc/mxs-lradc.c | 2 +- drivers/staging/iio/gyro/adis16260_ring.c | 2 +- drivers/staging/iio/iio_simple_dummy_buffer.c | 2 +- drivers/staging/iio/impedance-analyzer/ad5933.c | 2 +- drivers/staging/iio/imu/adis16400_ring.c | 2 +- drivers/staging/iio/meter/ade7758_ring.c | 2 +- drivers/staging/iio/ring_sw.c | 7 +++---- include/linux/iio/buffer.h | 6 ++---- 26 files changed, 30 insertions(+), 35 deletions(-) diff --git a/drivers/iio/adc/ad7266.c b/drivers/iio/adc/ad7266.c index 5c3f1ba..b11f214 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 ae847c5..67baa13 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 c1e4690..bc10091 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/industrialio-buffer.c b/drivers/iio/industrialio-buffer.c index 774891c..d4ad374 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 63da424..5bc5c86 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 9a99f43..164b62b 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/staging/iio/accel/adis16201_ring.c b/drivers/staging/iio/accel/adis16201_ring.c index 884dcf8..97c09f0 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 a7ff804..7507e1a 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 16e36e3..4c976be 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 5cfeff4..f939e29 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 d5ec43e..caff8e2 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 9332762..247605c 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 9fce404..c2906a8 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 3741ac6..940681f 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 f4b009e..ba04d0f 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 a4ff493..b39923b 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 84275c3..86026d9 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 774ae1b..5f74f3b 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 ae549e5..ca7c1fa 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 e6e2345..e294cb4 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 e080213..1fd3809 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 39a9be8..de21d47 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 6b71788..260bdd1 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 23c107a..9e49bac 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 f61c8fd..3a45f9a 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 8ba516f..c629b3a 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); -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH] iio: Drop timestamp parameter from buffer store_to callback 2012-09-04 12:38 ` [PATCH] iio: Drop timestamp parameter from buffer store_to callback Lars-Peter Clausen @ 2012-09-06 21:21 ` Jonathan Cameron 2012-09-07 9:12 ` Lars-Peter Clausen 0 siblings, 1 reply; 8+ messages in thread From: Jonathan Cameron @ 2012-09-06 21:21 UTC (permalink / raw) To: Lars-Peter Clausen; +Cc: Jonathan Cameron, linux-iio On 09/04/2012 01:38 PM, Lars-Peter Clausen wrote: > Drop timestamp parameter from buffer store_to callback and subsequently from > iio_push_to_buffer. The timestamp parameter is unused and it seems likely that > it will stay unused in the future, so it should be safe to remove it. Fine by me. I'll add the hid sensor driver that crossed with this patch separately for the first patch, but will have to just drop it in this one. Hope you don't mind! I'll post the proposed version in a mo. > > Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> > --- > drivers/iio/adc/ad7266.c | 2 +- > drivers/iio/adc/ad_sigma_delta.c | 2 +- > drivers/iio/adc/at91_adc.c | 2 +- > drivers/iio/industrialio-buffer.c | 5 ++--- > drivers/iio/kfifo_buf.c | 3 +-- > drivers/iio/light/adjd_s311.c | 2 +- > drivers/staging/iio/accel/adis16201_ring.c | 2 +- > drivers/staging/iio/accel/adis16203_ring.c | 2 +- > drivers/staging/iio/accel/adis16204_ring.c | 2 +- > drivers/staging/iio/accel/adis16209_ring.c | 2 +- > drivers/staging/iio/accel/adis16240_ring.c | 2 +- > drivers/staging/iio/accel/lis3l02dq_ring.c | 2 +- > drivers/staging/iio/adc/ad7298_ring.c | 2 +- > drivers/staging/iio/adc/ad7476_ring.c | 2 +- > drivers/staging/iio/adc/ad7606_ring.c | 2 +- > drivers/staging/iio/adc/ad7887_ring.c | 2 +- > drivers/staging/iio/adc/ad799x_ring.c | 2 +- > drivers/staging/iio/adc/max1363_ring.c | 2 +- > drivers/staging/iio/adc/mxs-lradc.c | 2 +- > drivers/staging/iio/gyro/adis16260_ring.c | 2 +- > drivers/staging/iio/iio_simple_dummy_buffer.c | 2 +- > drivers/staging/iio/impedance-analyzer/ad5933.c | 2 +- > drivers/staging/iio/imu/adis16400_ring.c | 2 +- > drivers/staging/iio/meter/ade7758_ring.c | 2 +- > drivers/staging/iio/ring_sw.c | 7 +++---- > include/linux/iio/buffer.h | 6 ++---- > 26 files changed, 30 insertions(+), 35 deletions(-) > > diff --git a/drivers/iio/adc/ad7266.c b/drivers/iio/adc/ad7266.c > index 5c3f1ba..b11f214 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 ae847c5..67baa13 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 c1e4690..bc10091 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/industrialio-buffer.c b/drivers/iio/industrialio-buffer.c > index 774891c..d4ad374 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 63da424..5bc5c86 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 9a99f43..164b62b 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/staging/iio/accel/adis16201_ring.c b/drivers/staging/iio/accel/adis16201_ring.c > index 884dcf8..97c09f0 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 a7ff804..7507e1a 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 16e36e3..4c976be 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 5cfeff4..f939e29 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 d5ec43e..caff8e2 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 9332762..247605c 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 9fce404..c2906a8 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 3741ac6..940681f 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 f4b009e..ba04d0f 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 a4ff493..b39923b 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 84275c3..86026d9 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 774ae1b..5f74f3b 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 ae549e5..ca7c1fa 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 e6e2345..e294cb4 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 e080213..1fd3809 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 39a9be8..de21d47 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 6b71788..260bdd1 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 23c107a..9e49bac 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 f61c8fd..3a45f9a 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 8ba516f..c629b3a 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); > > ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] iio: Drop timestamp parameter from buffer store_to callback 2012-09-06 21:21 ` Jonathan Cameron @ 2012-09-07 9:12 ` Lars-Peter Clausen 0 siblings, 0 replies; 8+ messages in thread From: Lars-Peter Clausen @ 2012-09-07 9:12 UTC (permalink / raw) To: Jonathan Cameron; +Cc: Jonathan Cameron, linux-iio On 09/06/2012 11:21 PM, Jonathan Cameron wrote: > On 09/04/2012 01:38 PM, Lars-Peter Clausen wrote: >> Drop timestamp parameter from buffer store_to callback and subsequently from >> iio_push_to_buffer. The timestamp parameter is unused and it seems likely that >> it will stay unused in the future, so it should be safe to remove it. > > Fine by me. I'll add the hid sensor driver that crossed with this patch > separately for the first patch, but will have to just drop it in this one. > Hope you don't mind! > > I'll post the proposed version in a mo. Sure, no problem. >> >> Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> >> --- ^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2012-09-07 9:12 UTC | newest] Thread overview: 8+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2012-09-04 11:31 [PATCH] staging:iio: Use iio_push_to_buffer Lars-Peter Clausen 2012-09-04 11:33 ` Lars-Peter Clausen 2012-09-04 11:35 ` [PATCH v2] " Lars-Peter Clausen 2012-09-04 11:48 ` Peter Meerwald 2012-09-04 11:59 ` Jonathan Cameron 2012-09-04 12:38 ` [PATCH] iio: Drop timestamp parameter from buffer store_to callback Lars-Peter Clausen 2012-09-06 21:21 ` Jonathan Cameron 2012-09-07 9:12 ` Lars-Peter Clausen
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).