openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging:iio:adc:ad7887 stop reading from buffer for sysfs access. 

No known use case and complicates in kernel interface work.

Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Acked-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Jonathan Cameron 2011-12-05 22:18:23 +00:00 committed by Greg Kroah-Hartman
parent 950935b17c
commit 790d875989
3 changed files with 1 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/staging/iio/adc/ad7887.h
View File

@ -83,14 +83,9 @@ enum ad7887_supported_device_ids {
}; };
#ifdef CONFIG_IIO_BUFFER #ifdef CONFIG_IIO_BUFFER
int ad7887_scan_from_ring(struct ad7887_state *st, int channum);
int ad7887_register_ring_funcs_and_init(struct iio_dev *indio_dev); int ad7887_register_ring_funcs_and_init(struct iio_dev *indio_dev);
void ad7887_ring_cleanup(struct iio_dev *indio_dev); void ad7887_ring_cleanup(struct iio_dev *indio_dev);
#else /* CONFIG_IIO_BUFFER */ #else /* CONFIG_IIO_BUFFER */
static inline int ad7887_scan_from_ring(struct ad7887_state *st, int channum)
{
return 0;
}
static inline int static inline int
ad7887_register_ring_funcs_and_init(struct iio_dev *indio_dev) ad7887_register_ring_funcs_and_init(struct iio_dev *indio_dev)

2
drivers/staging/iio/adc/ad7887_core.c
View File

@ -45,7 +45,7 @@ static int ad7887_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 = ad7887_scan_from_ring(st, 1 << chan->address); ret = -EBUSY;
else else
ret = ad7887_scan_direct(st, chan->address); ret = ad7887_scan_direct(st, chan->address);
mutex_unlock(&indio_dev->mlock); mutex_unlock(&indio_dev->mlock);

34
drivers/staging/iio/adc/ad7887_ring.c
View File

@ -19,40 +19,6 @@
#include "ad7887.h" #include "ad7887.h"
int ad7887_scan_from_ring(struct ad7887_state *st, int channum)
{
struct iio_buffer *ring = iio_priv_to_dev(st)->buffer;
int count = 0, ret;
u16 *ring_data;
if (!(test_bit(channum, 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;
/* for single channel scan the result is stored with zero offset */
if ((test_bit(1, ring->scan_mask) || test_bit(0, ring->scan_mask)) &&
(channum == 1))
count = 1;
ret = be16_to_cpu(ring_data[count]);
error_free_ring_data:
kfree(ring_data);
error_ret:
return ret;
}
/** /**
* ad7887_ring_preenable() setup the parameters of the ring before enabling * ad7887_ring_preenable() setup the parameters of the ring before enabling
* *