From bfd80760fbe159889d6e67c46804918a74c2170a Mon Sep 17 00:00:00 2001
From: Jonathan Cameron <jic23@kernel.org>
Date: Mon, 5 Dec 2011 22:18:19 +0000
Subject: [PATCH] --- yaml --- r: 281259 b: refs/heads/master c:
 389ac488330d9946a0f7dd572acd790e41486a9e h: refs/heads/master i:   281257:
 ef80395524a0eadb808b5204b4cc5ec3c8f23a58   281255:
 59fdb67741c12ac0289d1a7594c9ee0423e47de2 v: v3

---
 [refs]                                      |  2 +-
 trunk/drivers/staging/iio/adc/ad7298.h      |  5 ----
 trunk/drivers/staging/iio/adc/ad7298_core.c |  8 ++----
 trunk/drivers/staging/iio/adc/ad7298_ring.c | 29 ---------------------
 4 files changed, 3 insertions(+), 41 deletions(-)

diff --git a/[refs] b/[refs]
index 39ae6bfd0197..a2572834956a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e0f0ddad805e98ae725d52a6cc23ac114ecf6114
+refs/heads/master: 389ac488330d9946a0f7dd572acd790e41486a9e
diff --git a/trunk/drivers/staging/iio/adc/ad7298.h b/trunk/drivers/staging/iio/adc/ad7298.h
index 9ddf5cf0e519..a0e5dea415ef 100644
--- a/trunk/drivers/staging/iio/adc/ad7298.h
+++ b/trunk/drivers/staging/iio/adc/ad7298.h
@@ -54,14 +54,9 @@ struct ad7298_state {
 };
 
 #ifdef CONFIG_IIO_BUFFER
-int ad7298_scan_from_ring(struct iio_dev *indio_dev, long ch);
 int ad7298_register_ring_funcs_and_init(struct iio_dev *indio_dev);
 void ad7298_ring_cleanup(struct iio_dev *indio_dev);
 #else /* CONFIG_IIO_BUFFER */
-static inline int ad7298_scan_from_ring(struct iio_dev *indio_dev, long ch)
-{
-	return 0;
-}
 
 static inline int
 ad7298_register_ring_funcs_and_init(struct iio_dev *indio_dev)
diff --git a/trunk/drivers/staging/iio/adc/ad7298_core.c b/trunk/drivers/staging/iio/adc/ad7298_core.c
index 656b77be4af4..a8341f2ce914 100644
--- a/trunk/drivers/staging/iio/adc/ad7298_core.c
+++ b/trunk/drivers/staging/iio/adc/ad7298_core.c
@@ -123,12 +123,8 @@ static int ad7298_read_raw(struct iio_dev *indio_dev,
 	switch (m) {
 	case 0:
 		mutex_lock(&indio_dev->mlock);
-		if (iio_buffer_enabled(indio_dev)) {
-			if (chan->address == AD7298_CH_TEMP)
-				ret = -ENODEV;
-			else
-				ret = ad7298_scan_from_ring(indio_dev,
-							    chan->address);
+		if (indio_dev->currentmode == INDIO_BUFFER_TRIGGERED) {
+			ret = -EBUSY;
 		} else {
 			if (chan->address == AD7298_CH_TEMP)
 				ret = ad7298_scan_temp(st, val);
diff --git a/trunk/drivers/staging/iio/adc/ad7298_ring.c b/trunk/drivers/staging/iio/adc/ad7298_ring.c
index 5695eb264168..d1a12dd015e2 100644
--- a/trunk/drivers/staging/iio/adc/ad7298_ring.c
+++ b/trunk/drivers/staging/iio/adc/ad7298_ring.c
@@ -18,35 +18,6 @@
 
 #include "ad7298.h"
 
-int ad7298_scan_from_ring(struct iio_dev *indio_dev, long ch)
-{
-	struct iio_buffer *ring = indio_dev->buffer;
-	int ret;
-	u16 *ring_data;
-
-	if (!(test_bit(ch, ring->scan_mask))) {
-		ret = -EBUSY;
-		goto error_ret;
-	}
-
-	ring_data = kmalloc(ring->access->get_bytes_per_datum(ring),
-			    GFP_KERNEL);
-	if (ring_data == NULL) {
-		ret = -ENOMEM;
-		goto error_ret;
-	}
-	ret = ring->access->read_last(ring, (u8 *) ring_data);
-	if (ret)
-		goto error_free_ring_data;
-
-	ret = be16_to_cpu(ring_data[ch]);
-
-error_free_ring_data:
-	kfree(ring_data);
-error_ret:
-	return ret;
-}
-
 /**
  * ad7298_ring_preenable() setup the parameters of the ring before enabling
  *