From 3fff373ee767afa92c02f9007c02fe46d03ba39b Mon Sep 17 00:00:00 2001 From: Jonathan Cameron Date: Sat, 21 Apr 2012 10:09:37 +0100 Subject: [PATCH] --- yaml --- r: 304430 b: refs/heads/master c: 8f03aabc0fbaa795ed6253010b27065fa4159825 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/iio/adc/ad7298.h | 1 - trunk/drivers/staging/iio/adc/ad7298_ring.c | 24 +++++++-------------- 3 files changed, 9 insertions(+), 18 deletions(-) diff --git a/[refs] b/[refs] index 14f36ff451cc..fcd6e9a789a7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2150489ffbd1cd6f5d1091c1738b1adfbdf34a43 +refs/heads/master: 8f03aabc0fbaa795ed6253010b27065fa4159825 diff --git a/trunk/drivers/staging/iio/adc/ad7298.h b/trunk/drivers/staging/iio/adc/ad7298.h index a0e5dea415ef..5051a7e4d4fd 100644 --- a/trunk/drivers/staging/iio/adc/ad7298.h +++ b/trunk/drivers/staging/iio/adc/ad7298.h @@ -38,7 +38,6 @@ struct ad7298_platform_data { struct ad7298_state { struct spi_device *spi; struct regulator *reg; - size_t d_size; u16 int_vref_mv; unsigned ext_ref; struct spi_transfer ring_xfer[10]; diff --git a/trunk/drivers/staging/iio/adc/ad7298_ring.c b/trunk/drivers/staging/iio/adc/ad7298_ring.c index feeb0eeba59a..5c13690d98a8 100644 --- a/trunk/drivers/staging/iio/adc/ad7298_ring.c +++ b/trunk/drivers/staging/iio/adc/ad7298_ring.c @@ -28,25 +28,17 @@ static int ad7298_ring_preenable(struct iio_dev *indio_dev) { struct ad7298_state *st = iio_priv(indio_dev); - struct iio_buffer *ring = indio_dev->buffer; - size_t d_size; int i, m; unsigned short command; - int scan_count = bitmap_weight(indio_dev->active_scan_mask, - indio_dev->masklength); - d_size = scan_count * (AD7298_STORAGE_BITS / 8); - - if (ring->scan_timestamp) { - d_size += sizeof(s64); - - if (d_size % sizeof(s64)) - d_size += sizeof(s64) - (d_size % sizeof(s64)); - } + int scan_count, ret; - if (ring->access->set_bytes_per_datum) - ring->access->set_bytes_per_datum(ring, d_size); + ret = iio_sw_buffer_preenable(indio_dev); + if (ret < 0) + return ret; - st->d_size = d_size; + /* Now compute overall size */ + scan_count = bitmap_weight(indio_dev->active_scan_mask, + indio_dev->masklength); command = AD7298_WRITE | st->ext_ref; @@ -102,7 +94,7 @@ static irqreturn_t ad7298_trigger_handler(int irq, void *p) if (ring->scan_timestamp) { time_ns = iio_get_time_ns(); - memcpy((u8 *)buf + st->d_size - sizeof(s64), + memcpy((u8 *)buf + indio_dev->scan_bytes - sizeof(s64), &time_ns, sizeof(time_ns)); }