aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/iio/adc/ad7476_core.c
diff options
context:
space:
mode:
authorJonathan Cameron <jic23@cam.ac.uk>2011-08-30 07:32:47 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2011-09-06 18:59:10 -0400
commit1aa042783251c27a93e31929c24647729db326d4 (patch)
tree137aba5136332c8c8ad7d2cdd5d194084751f0f5 /drivers/staging/iio/adc/ad7476_core.c
parent6356463cf4627f599547f0698853ef419b2d2f1d (diff)
staging: iio: push the main buffer chrdev down to the top level.
Sorry all, this one is very invasive, though the driver changes are just trivial interface fixes. Not all done yet. V2 - bring the sca3000 with us. V3 - fix ade7758 bugs in conversion. V4 - add ad5933 Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk> Acked-by: Michael Hennerich <michael.hennerich@analog.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/iio/adc/ad7476_core.c')
-rw-r--r--drivers/staging/iio/adc/ad7476_core.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/iio/adc/ad7476_core.c b/drivers/staging/iio/adc/ad7476_core.c
index bb8be5daa6b..bea9e82057f 100644
--- a/drivers/staging/iio/adc/ad7476_core.c
+++ b/drivers/staging/iio/adc/ad7476_core.c
@@ -186,7 +186,7 @@ static int __devinit ad7476_probe(struct spi_device *spi)
186 if (ret) 186 if (ret)
187 goto error_disable_reg; 187 goto error_disable_reg;
188 188
189 ret = iio_ring_buffer_register_ex(indio_dev->ring, 0, 189 ret = iio_ring_buffer_register_ex(indio_dev, 0,
190 st->chip_info->channel, 190 st->chip_info->channel,
191 ARRAY_SIZE(st->chip_info->channel)); 191 ARRAY_SIZE(st->chip_info->channel));
192 if (ret) 192 if (ret)
@@ -215,7 +215,7 @@ static int ad7476_remove(struct spi_device *spi)
215 /* copy needed as st will have been freed */ 215 /* copy needed as st will have been freed */
216 struct regulator *reg = st->reg; 216 struct regulator *reg = st->reg;
217 217
218 iio_ring_buffer_unregister(indio_dev->ring); 218 iio_ring_buffer_unregister(indio_dev);
219 ad7476_ring_cleanup(indio_dev); 219 ad7476_ring_cleanup(indio_dev);
220 iio_device_unregister(indio_dev); 220 iio_device_unregister(indio_dev);
221 if (!IS_ERR(reg)) { 221 if (!IS_ERR(reg)) {