Commit 729bbf54 authored by Jonathan Cameron's avatar Jonathan Cameron Committed by Greg Kroah-Hartman
Browse files

staging:iio:adc:ad799x stop reading from buffer for sysfs accesses 



No known use case and makes in kernel interface work more complex.

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 790d8759

drivers/staging/iio/adc/ad799x.h

+0 −6
Original line number Original line Diff line number Diff line
@@ -124,15 +124,9 @@ struct ad799x_platform_data { 
int ad7997_8_set_scan_mode(struct ad799x_state *st, unsigned mask);

int ad7997_8_set_scan_mode(struct ad799x_state *st, unsigned mask);





#ifdef CONFIG_AD799X_RING_BUFFER

#ifdef CONFIG_AD799X_RING_BUFFER

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

int ad799x_register_ring_funcs_and_init(struct iio_dev *indio_dev);

void ad799x_ring_cleanup(struct iio_dev *indio_dev);

void ad799x_ring_cleanup(struct iio_dev *indio_dev);

#else /* CONFIG_AD799X_RING_BUFFER */

#else /* CONFIG_AD799X_RING_BUFFER */

int ad799x_single_channel_from_ring(struct iio_dev *indio_dev, int channum)

{

	return -EINVAL;

}







static inline int

static inline int

ad799x_register_ring_funcs_and_init(struct iio_dev *indio_dev)

ad799x_register_ring_funcs_and_init(struct iio_dev *indio_dev)

drivers/staging/iio/adc/ad799x_core.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -151,8 +151,7 @@ static int ad799x_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 = ad799x_single_channel_from_ring(indio_dev,

			ret = -EBUSY;

							      chan->scan_index);

		else

		else

			ret = ad799x_scan_direct(st, chan->scan_index);

			ret = ad799x_scan_direct(st, chan->scan_index);

		mutex_unlock(&indio_dev->mlock);

		mutex_unlock(&indio_dev->mlock);

drivers/staging/iio/adc/ad799x_ring.c

+0 −30
Original line number Original line Diff line number Diff line
@@ -23,36 +23,6 @@ 




#include "ad799x.h"

#include "ad799x.h"





int ad799x_single_channel_from_ring(struct iio_dev *indio_dev, int channum)

{

	struct iio_buffer *ring = indio_dev->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;

	/* Need a count of channels prior to this one */

	count = bitmap_weight(ring->scan_mask, channum);

	ret = be16_to_cpu(ring_data[count]);



error_free_ring_data:

	kfree(ring_data);

error_ret:

	return ret;

}



/**

/**

 * ad799x_ring_preenable() setup the parameters of the ring before enabling

 * ad799x_ring_preenable() setup the parameters of the ring before enabling

 *

 *