evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

staging:iio:adc:ad7793: Use new triggered buffer setup helper function

Browse source 
Use the new triggered buffer setup helper function to allocate and register
buffer and pollfunc.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Acked-by: Jonathan Cameron <jic23@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Lars-Peter Clausen 2012-06-18 18:33:54 +02:00 • committed by Greg Kroah-Hartman
parent 74ed964931
commit 82796edca9
2 changed files with 7 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
drivers/staging/iio/adc/Kconfig
View file

@ -112,8 +112,7 @@ config AD7793
tristate "Analog Devices AD7792 AD7793 ADC driver" tristate "Analog Devices AD7792 AD7793 ADC driver"
depends on SPI depends on SPI
select IIO_BUFFER select IIO_BUFFER
select IIO_KFIFO_BUF select IIO_TRIGGERED_BUFFER
select IIO_TRIGGER
help help
Say yes here to build support for Analog Devices Say yes here to build support for Analog Devices
AD7792 and AD7793 SPI analog to digital converters (ADC). AD7792 and AD7793 SPI analog to digital converters (ADC).

49
drivers/staging/iio/adc/ad7793.c
View file

@ -21,9 +21,9 @@
#include <linux/iio/iio.h> #include <linux/iio/iio.h>
#include <linux/iio/sysfs.h> #include <linux/iio/sysfs.h>
#include <linux/iio/buffer.h> #include <linux/iio/buffer.h>
#include <linux/iio/kfifo_buf.h>
#include <linux/iio/trigger.h> #include <linux/iio/trigger.h>
#include <linux/iio/trigger_consumer.h> #include <linux/iio/trigger_consumer.h>
#include <linux/iio/triggered_buffer.h>
#include "ad7793.h" #include "ad7793.h"
@ -407,41 +407,13 @@ static const struct iio_buffer_setup_ops ad7793_ring_setup_ops = {
static int ad7793_register_ring_funcs_and_init(struct iio_dev *indio_dev) static int ad7793_register_ring_funcs_and_init(struct iio_dev *indio_dev)
{ {
int ret; return iio_triggered_buffer_setup(indio_dev, &iio_pollfunc_store_time,
&ad7793_trigger_handler, &ad7793_ring_setup_ops);
indio_dev->buffer = iio_kfifo_allocate(indio_dev);
if (!indio_dev->buffer) {
ret = -ENOMEM;
goto error_ret;
}
indio_dev->pollfunc = iio_alloc_pollfunc(&iio_pollfunc_store_time,
&ad7793_trigger_handler,
IRQF_ONESHOT,
indio_dev,
"ad7793_consumer%d",
indio_dev->id);
if (indio_dev->pollfunc == NULL) {
ret = -ENOMEM;
goto error_deallocate_kfifo;
}
/* Ring buffer functions - here trigger setup related */
indio_dev->setup_ops = &ad7793_ring_setup_ops;
/* Flag that polled ring buffering is possible */
indio_dev->modes |= INDIO_BUFFER_TRIGGERED;
return 0;
error_deallocate_kfifo:
iio_kfifo_free(indio_dev->buffer);
error_ret:
return ret;
} }
static void ad7793_ring_cleanup(struct iio_dev *indio_dev) static void ad7793_ring_cleanup(struct iio_dev *indio_dev)
{ {
iio_dealloc_pollfunc(indio_dev->pollfunc); iio_triggered_buffer_cleanup(indio_dev);
iio_kfifo_free(indio_dev->buffer);
} }
/** /**
@ -959,24 +931,16 @@ static int __devinit ad7793_probe(struct spi_device *spi)
if (ret) if (ret)
goto error_unreg_ring; goto error_unreg_ring;
ret = iio_buffer_register(indio_dev, ret = ad7793_setup(st);
indio_dev->channels,
indio_dev->num_channels);
if (ret) if (ret)
goto error_remove_trigger; goto error_remove_trigger;
ret = ad7793_setup(st);
if (ret)
goto error_uninitialize_ring;
ret = iio_device_register(indio_dev); ret = iio_device_register(indio_dev);
if (ret) if (ret)
goto error_uninitialize_ring; goto error_remove_trigger;
return 0; return 0;
error_uninitialize_ring:
iio_buffer_unregister(indio_dev);
error_remove_trigger: error_remove_trigger:
ad7793_remove_trigger(indio_dev); ad7793_remove_trigger(indio_dev);
error_unreg_ring: error_unreg_ring:
@ -999,7 +963,6 @@ static int ad7793_remove(struct spi_device *spi)
struct ad7793_state *st = iio_priv(indio_dev); struct ad7793_state *st = iio_priv(indio_dev);
iio_device_unregister(indio_dev); iio_device_unregister(indio_dev);
iio_buffer_unregister(indio_dev);
ad7793_remove_trigger(indio_dev); ad7793_remove_trigger(indio_dev);
ad7793_ring_cleanup(indio_dev); ad7793_ring_cleanup(indio_dev);