---

yaml --- r: 268591 b: refs/heads/master c: f2a6342 h: refs/heads/master i: 268589: ffedaee 268587: 728b914 268583: 596e425 268575: 9afbe6b v: v3
git-mirror · Oct 3, 2011 · ba3c78e · ba3c78e
1 parent 8e23e32
commit ba3c78e
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 24cba40615aff04a4654db90545d07d41ffa7ba5
+refs/heads/master: f2a634291e87bd7b8afa78d018ef9c51647682d8
diff --git a/trunk/drivers/staging/iio/adc/ad799x.h b/trunk/drivers/staging/iio/adc/ad799x.h
@@ -124,11 +124,11 @@ struct ad799x_platform_data {
 int ad7997_8_set_scan_mode(struct ad799x_state *st, unsigned mask);
 
 #ifdef CONFIG_AD799X_RING_BUFFER
-int ad799x_single_channel_from_ring(struct ad799x_state *st, int channum);
+int ad799x_single_channel_from_ring(struct iio_dev *indio_dev, int channum);
 int ad799x_register_ring_funcs_and_init(struct iio_dev *indio_dev);
 void ad799x_ring_cleanup(struct iio_dev *indio_dev);
 #else /* CONFIG_AD799X_RING_BUFFER */
-int ad799x_single_channel_from_ring(struct ad799x_state *st, int channum)
+int ad799x_single_channel_from_ring(struct iio_dev *indio_dev, int channum)
 {
 	return -EINVAL;
 }

diff --git a/trunk/drivers/staging/iio/adc/ad799x_core.c b/trunk/drivers/staging/iio/adc/ad799x_core.c
@@ -150,7 +150,7 @@ static int ad799x_read_raw(struct iio_dev *dev_info,
 	case 0:
 		mutex_lock(&dev_info->mlock);
 		if (iio_buffer_enabled(dev_info))
-			ret = ad799x_single_channel_from_ring(st,
+			ret = ad799x_single_channel_from_ring(dev_info,
 							      chan->scan_index);
 		else
 			ret = ad799x_scan_direct(st, chan->address);

diff --git a/trunk/drivers/staging/iio/adc/ad799x_ring.c b/trunk/drivers/staging/iio/adc/ad799x_ring.c
@@ -23,9 +23,9 @@
 
 #include "ad799x.h"
 
-int ad799x_single_channel_from_ring(struct ad799x_state *st, int channum)
+int ad799x_single_channel_from_ring(struct iio_dev *indio_dev, int channum)
 {
-	struct iio_buffer *ring = iio_priv_to_dev(st)->buffer;
+	struct iio_buffer *ring = indio_dev->buffer;
 	int count = 0, ret;
 	u16 *ring_data;