From 0d841274fdc0f030233b2511eed7b7e324e4cbf3 Mon Sep 17 00:00:00 2001
From: Jonathan Cameron <jic23@kernel.org>
Date: Sat, 21 Apr 2012 10:09:38 +0100
Subject: [PATCH] --- yaml --- r: 304431 b: refs/heads/master c:
 46df6378c8484eb3ae054938ffb17c2bea691f7b h: refs/heads/master i:   304429:
 f2abde19ace0f0be65de61ef7224cf2c6ccf16ed   304427:
 c7ab64d171a39a3f14afefd625047a3380f867f2   304423:
 ddb4f01a5a3d43bbd7e94dac27b92d080d00f9b0   304415:
 d9291dc7577cba36a99b9336d6059fc5ef550d9c v: v3

---
 [refs]                                      |  2 +-
 trunk/drivers/staging/iio/adc/ad7476.h      |  1 -
 trunk/drivers/staging/iio/adc/ad7476_ring.c | 36 ++-------------------
 3 files changed, 4 insertions(+), 35 deletions(-)

diff --git a/[refs] b/[refs]
index fcd6e9a789a7..6ef84960c05d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8f03aabc0fbaa795ed6253010b27065fa4159825
+refs/heads/master: 46df6378c8484eb3ae054938ffb17c2bea691f7b
diff --git a/trunk/drivers/staging/iio/adc/ad7476.h b/trunk/drivers/staging/iio/adc/ad7476.h
index 27f696c75cc4..b1dd9317fe1f 100644
--- a/trunk/drivers/staging/iio/adc/ad7476.h
+++ b/trunk/drivers/staging/iio/adc/ad7476.h
@@ -27,7 +27,6 @@ struct ad7476_state {
 	struct spi_device		*spi;
 	const struct ad7476_chip_info	*chip_info;
 	struct regulator		*reg;
-	size_t				d_size;
 	u16				int_vref_mv;
 	struct spi_transfer		xfer;
 	struct spi_message		msg;
diff --git a/trunk/drivers/staging/iio/adc/ad7476_ring.c b/trunk/drivers/staging/iio/adc/ad7476_ring.c
index d6af6c05ce1c..a090bc3acc9d 100644
--- a/trunk/drivers/staging/iio/adc/ad7476_ring.c
+++ b/trunk/drivers/staging/iio/adc/ad7476_ring.c
@@ -20,36 +20,6 @@
 
 #include "ad7476.h"
 
-/**
- * ad7476_ring_preenable() setup the parameters of the ring before enabling
- *
- * The complex nature of the setting of the number of bytes per datum is due
- * to this driver currently ensuring that the timestamp is stored at an 8
- * byte boundary.
- **/
-static int ad7476_ring_preenable(struct iio_dev *indio_dev)
-{
-	struct ad7476_state *st = iio_priv(indio_dev);
-	struct iio_buffer *ring = indio_dev->buffer;
-
-	st->d_size = bitmap_weight(indio_dev->active_scan_mask,
-				   indio_dev->masklength) *
-		st->chip_info->channel[0].scan_type.storagebits / 8;
-
-	if (ring->scan_timestamp) {
-		st->d_size += sizeof(s64);
-
-		if (st->d_size % sizeof(s64))
-			st->d_size += sizeof(s64) - (st->d_size % sizeof(s64));
-	}
-
-	if (indio_dev->buffer->access->set_bytes_per_datum)
-		indio_dev->buffer->access->
-			set_bytes_per_datum(indio_dev->buffer, st->d_size);
-
-	return 0;
-}
-
 static irqreturn_t ad7476_trigger_handler(int irq, void  *p)
 {
 	struct iio_poll_func *pf = p;
@@ -59,7 +29,7 @@ static irqreturn_t ad7476_trigger_handler(int irq, void  *p)
 	__u8 *rxbuf;
 	int b_sent;
 
-	rxbuf = kzalloc(st->d_size, GFP_KERNEL);
+	rxbuf = kzalloc(indio_dev->scan_bytes, GFP_KERNEL);
 	if (rxbuf == NULL)
 		return -ENOMEM;
 
@@ -71,7 +41,7 @@ static irqreturn_t ad7476_trigger_handler(int irq, void  *p)
 	time_ns = iio_get_time_ns();
 
 	if (indio_dev->buffer->scan_timestamp)
-		memcpy(rxbuf + st->d_size - sizeof(s64),
+		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);
@@ -83,7 +53,7 @@ static irqreturn_t ad7476_trigger_handler(int irq, void  *p)
 }
 
 static const struct iio_buffer_setup_ops ad7476_ring_setup_ops = {
-	.preenable = &ad7476_ring_preenable,
+	.preenable = &iio_sw_buffer_preenable,
 	.postenable = &iio_triggered_buffer_postenable,
 	.predisable = &iio_triggered_buffer_predisable,
 };