OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

staging:iio:adc:ad799x avoid bouncing back and forth from iio_priv space. 

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>
This commit is contained in:
Jonathan Cameron 2011-09-30 10:05:34 +01:00 committed by Greg Kroah-Hartman
parent 24cba40615
commit f2a634291e
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/staging/iio/adc/ad799x.h
View File

@ -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;
}

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

@ -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);

4
drivers/staging/iio/adc/ad799x_ring.c
View File

@ -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;