Commit 1ffe2e7a authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Jonathan Cameron

staging:iio:adis16400: Use triggered buffer setup helper function

Use the triggered buffer helper functions to setup and tear down the buffer for
the adis16400 instead of doing this manually. This also means that we switch
away from the deprecated sw_ring buffer and use the kfifo buffer now instead.
Signed-off-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
parent cd888a17
...@@ -981,18 +981,10 @@ static int adis16400_probe(struct spi_device *spi) ...@@ -981,18 +981,10 @@ static int adis16400_probe(struct spi_device *spi)
if (ret) if (ret)
goto error_free_dev; goto error_free_dev;
ret = iio_buffer_register(indio_dev,
st->variant->channels,
st->variant->num_channels);
if (ret) {
dev_err(&spi->dev, "failed to initialize the ring\n");
goto error_unreg_ring_funcs;
}
if (spi->irq) { if (spi->irq) {
ret = adis_probe_trigger(&st->adis, indio_dev); ret = adis_probe_trigger(&st->adis, indio_dev);
if (ret) if (ret)
goto error_uninitialize_ring; goto error_unreg_ring_funcs;
} }
/* Get the device into a sane initial state */ /* Get the device into a sane initial state */
...@@ -1008,8 +1000,6 @@ static int adis16400_probe(struct spi_device *spi) ...@@ -1008,8 +1000,6 @@ static int adis16400_probe(struct spi_device *spi)
error_remove_trigger: error_remove_trigger:
if (spi->irq) if (spi->irq)
adis_remove_trigger(&st->adis); adis_remove_trigger(&st->adis);
error_uninitialize_ring:
iio_buffer_unregister(indio_dev);
error_unreg_ring_funcs: error_unreg_ring_funcs:
adis16400_unconfigure_ring(indio_dev); adis16400_unconfigure_ring(indio_dev);
error_free_dev: error_free_dev:
...@@ -1029,7 +1019,6 @@ static int adis16400_remove(struct spi_device *spi) ...@@ -1029,7 +1019,6 @@ static int adis16400_remove(struct spi_device *spi)
if (spi->irq) if (spi->irq)
adis_remove_trigger(&st->adis); adis_remove_trigger(&st->adis);
iio_buffer_unregister(indio_dev);
adis16400_unconfigure_ring(indio_dev); adis16400_unconfigure_ring(indio_dev);
iio_device_free(indio_dev); iio_device_free(indio_dev);
......
...@@ -7,7 +7,8 @@ ...@@ -7,7 +7,8 @@
#include <linux/export.h> #include <linux/export.h>
#include <linux/iio/iio.h> #include <linux/iio/iio.h>
#include "../ring_sw.h" #include <linux/iio/buffer.h>
#include <linux/iio/triggered_buffer.h>
#include <linux/iio/trigger_consumer.h> #include <linux/iio/trigger_consumer.h>
#include "adis16400.h" #include "adis16400.h"
...@@ -159,47 +160,13 @@ static irqreturn_t adis16400_trigger_handler(int irq, void *p) ...@@ -159,47 +160,13 @@ static irqreturn_t adis16400_trigger_handler(int irq, void *p)
return IRQ_HANDLED; return IRQ_HANDLED;
} }
void adis16400_unconfigure_ring(struct iio_dev *indio_dev) int adis16400_configure_ring(struct iio_dev *indio_dev)
{ {
iio_dealloc_pollfunc(indio_dev->pollfunc); return iio_triggered_buffer_setup(indio_dev, &iio_pollfunc_store_time,
iio_sw_rb_free(indio_dev->buffer); &adis16400_trigger_handler, NULL);
} }
static const struct iio_buffer_setup_ops adis16400_ring_setup_ops = { void adis16400_unconfigure_ring(struct iio_dev *indio_dev)
.preenable = &iio_sw_buffer_preenable,
.postenable = &iio_triggered_buffer_postenable,
.predisable = &iio_triggered_buffer_predisable,
};
int adis16400_configure_ring(struct iio_dev *indio_dev)
{ {
int ret = 0; iio_triggered_buffer_cleanup(indio_dev);
struct iio_buffer *ring;
ring = iio_sw_rb_allocate(indio_dev);
if (!ring) {
ret = -ENOMEM;
return ret;
}
indio_dev->buffer = ring;
ring->scan_timestamp = true;
indio_dev->setup_ops = &adis16400_ring_setup_ops;
indio_dev->pollfunc = iio_alloc_pollfunc(&iio_pollfunc_store_time,
&adis16400_trigger_handler,
IRQF_ONESHOT,
indio_dev,
"%s_consumer%d",
indio_dev->name,
indio_dev->id);
if (indio_dev->pollfunc == NULL) {
ret = -ENOMEM;
goto error_iio_sw_rb_free;
}
indio_dev->modes |= INDIO_BUFFER_TRIGGERED;
return 0;
error_iio_sw_rb_free:
iio_sw_rb_free(indio_dev->buffer);
return ret;
} }
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