From 491416ec6dca0a35a01bd9f313cf8859d9d021af Mon Sep 17 00:00:00 2001
From: Jonathan Cameron <jic23@kernel.org>
Date: Mon, 5 Dec 2011 22:18:21 +0000
Subject: [PATCH] --- yaml --- r: 281261 b: refs/heads/master c:
 9380d5ed36268432322fdd50c10bf0eb466b700a h: refs/heads/master i:   281259:
 bfd80760fbe159889d6e67c46804918a74c2170a v: v3

---
 [refs]                                      |  2 +-
 trunk/drivers/staging/iio/adc/ad7606.h      |  1 -
 trunk/drivers/staging/iio/adc/ad7606_core.c |  2 +-
 trunk/drivers/staging/iio/adc/ad7606_ring.c | 24 ---------------------
 4 files changed, 2 insertions(+), 27 deletions(-)

diff --git a/[refs] b/[refs]
index 01fda770b3a3..a4eeb2a3267e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 78c32ed39e26ef3a65d94072c9a845eefe84d4d9
+refs/heads/master: 9380d5ed36268432322fdd50c10bf0eb466b700a
diff --git a/trunk/drivers/staging/iio/adc/ad7606.h b/trunk/drivers/staging/iio/adc/ad7606.h
index 35018c3f518e..10f59896597f 100644
--- a/trunk/drivers/staging/iio/adc/ad7606.h
+++ b/trunk/drivers/staging/iio/adc/ad7606.h
@@ -99,7 +99,6 @@ enum ad7606_supported_device_ids {
 	ID_AD7606_4
 };
 
-int ad7606_scan_from_ring(struct iio_dev *indio_dev, unsigned ch);
 int ad7606_register_ring_funcs_and_init(struct iio_dev *indio_dev);
 void ad7606_ring_cleanup(struct iio_dev *indio_dev);
 #endif /* IIO_ADC_AD7606_H_ */
diff --git a/trunk/drivers/staging/iio/adc/ad7606_core.c b/trunk/drivers/staging/iio/adc/ad7606_core.c
index a8596b856a3e..da258463d75e 100644
--- a/trunk/drivers/staging/iio/adc/ad7606_core.c
+++ b/trunk/drivers/staging/iio/adc/ad7606_core.c
@@ -91,7 +91,7 @@ static int ad7606_read_raw(struct iio_dev *indio_dev,
 	case 0:
 		mutex_lock(&indio_dev->mlock);
 		if (iio_buffer_enabled(indio_dev))
-			ret = ad7606_scan_from_ring(indio_dev, chan->address);
+			ret = -EBUSY;
 		else
 			ret = ad7606_scan_direct(indio_dev, chan->address);
 		mutex_unlock(&indio_dev->mlock);
diff --git a/trunk/drivers/staging/iio/adc/ad7606_ring.c b/trunk/drivers/staging/iio/adc/ad7606_ring.c
index f682af652a8f..e8f94a18a943 100644
--- a/trunk/drivers/staging/iio/adc/ad7606_ring.c
+++ b/trunk/drivers/staging/iio/adc/ad7606_ring.c
@@ -18,30 +18,6 @@
 
 #include "ad7606.h"
 
-int ad7606_scan_from_ring(struct iio_dev *indio_dev, unsigned ch)
-{
-	struct iio_buffer *ring = indio_dev->buffer;
-	int ret;
-	u16 *ring_data;
-
-	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 = ring_data[ch];
-
-error_free_ring_data:
-	kfree(ring_data);
-error_ret:
-	return ret;
-}
-
 /**
  * ad7606_trigger_handler_th() th/bh of trigger launched polling to ring buffer
  *