Commit 78c32ed3 authored by Jonathan Cameron's avatar Jonathan Cameron Committed by Greg Kroah-Hartman

staging:iio:adc:ad7606 remove buffer access for sysfs interfaces.

No known use case and complicates in kernel interface work.
Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
Acked-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 389ac488
...@@ -50,14 +50,9 @@ enum ad7476_supported_device_ids { ...@@ -50,14 +50,9 @@ enum ad7476_supported_device_ids {
}; };
#ifdef CONFIG_IIO_BUFFER #ifdef CONFIG_IIO_BUFFER
int ad7476_scan_from_ring(struct iio_dev *indio_dev);
int ad7476_register_ring_funcs_and_init(struct iio_dev *indio_dev); int ad7476_register_ring_funcs_and_init(struct iio_dev *indio_dev);
void ad7476_ring_cleanup(struct iio_dev *indio_dev); void ad7476_ring_cleanup(struct iio_dev *indio_dev);
#else /* CONFIG_IIO_BUFFER */ #else /* CONFIG_IIO_BUFFER */
static inline int ad7476_scan_from_ring(struct iio_dev *indio_dev)
{
return 0;
}
static inline int static inline int
ad7476_register_ring_funcs_and_init(struct iio_dev *indio_dev) ad7476_register_ring_funcs_and_init(struct iio_dev *indio_dev)
......
...@@ -46,7 +46,7 @@ static int ad7476_read_raw(struct iio_dev *indio_dev, ...@@ -46,7 +46,7 @@ static int ad7476_read_raw(struct iio_dev *indio_dev,
case 0: case 0:
mutex_lock(&indio_dev->mlock); mutex_lock(&indio_dev->mlock);
if (iio_buffer_enabled(indio_dev)) if (iio_buffer_enabled(indio_dev))
ret = ad7476_scan_from_ring(indio_dev); ret = -EBUSY;
else else
ret = ad7476_scan_direct(st); ret = ad7476_scan_direct(st);
mutex_unlock(&indio_dev->mlock); mutex_unlock(&indio_dev->mlock);
......
...@@ -20,30 +20,6 @@ ...@@ -20,30 +20,6 @@
#include "ad7476.h" #include "ad7476.h"
int ad7476_scan_from_ring(struct iio_dev *indio_dev)
{
struct iio_buffer *ring = indio_dev->buffer;
int ret;
u8 *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, ring_data);
if (ret)
goto error_free_ring_data;
ret = (ring_data[0] << 8) | ring_data[1];
error_free_ring_data:
kfree(ring_data);
error_ret:
return ret;
}
/** /**
* ad7476_ring_preenable() setup the parameters of the ring before enabling * ad7476_ring_preenable() setup the parameters of the ring before enabling
* *
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment