staging:iio:adc:max1363 ring_sw->kfifo conversion

We are moving towards scrapping ring_sw so this move
is necessary.

Signed-off-by: Jonathan Cameron <jic23@kernel.org>

diff --git a/drivers/staging/iio/adc/Kconfig b/drivers/staging/iio/adc/Kconfig
index eba64fb64d827068de204815c3085b4ab52476d2..e662a5c55b550bc99aed79d1866826c19c5a1f60 100644 (file)
--- a/drivers/staging/iio/adc/Kconfig
+++ b/drivers/staging/iio/adc/Kconfig
@@ -149,7 +149,7 @@ config MAX1363_RING_BUFFER
        bool "Maxim max1363: use ring buffer"
        depends on MAX1363
        select IIO_BUFFER
-       select IIO_SW_RING
+       select IIO_KFIFO_BUF
        help
          Say yes here to include ring buffer support in the MAX1363
          ADC driver.

diff --git a/drivers/staging/iio/adc/max1363_ring.c b/drivers/staging/iio/adc/max1363_ring.c
index 688304bdbaf0815452765b3c75e11bfc6cfcf2a8..41af17b5e74fd8ad26c867db083b8208d8120347 100644 (file)
--- a/drivers/staging/iio/adc/max1363_ring.c
+++ b/drivers/staging/iio/adc/max1363_ring.c
@@ -16,7 +16,7 @@
 
 #include <linux/iio/iio.h>
 #include <linux/iio/buffer.h>
-#include "../ring_sw.h"
+#include <linux/iio/kfifo_buf.h>
 #include <linux/iio/trigger_consumer.h>
 
 #include "max1363.h"
@@ -101,7 +101,7 @@ int max1363_register_ring_funcs_and_init(struct iio_dev *indio_dev)
        struct max1363_state *st = iio_priv(indio_dev);
        int ret = 0;
 
-       indio_dev->buffer = iio_sw_rb_allocate(indio_dev);
+       indio_dev->buffer = iio_kfifo_allocate(indio_dev);
        if (!indio_dev->buffer) {
                ret = -ENOMEM;
                goto error_ret;
@@ -126,7 +126,7 @@ int max1363_register_ring_funcs_and_init(struct iio_dev *indio_dev)
        return 0;
 
 error_deallocate_sw_rb:
-       iio_sw_rb_free(indio_dev->buffer);
+       iio_kfifo_free(indio_dev->buffer);
 error_ret:
        return ret;
 }
@@ -135,5 +135,5 @@ void max1363_ring_cleanup(struct iio_dev *indio_dev)
 {
        /* ensure that the trigger has been detached */
        iio_dealloc_pollfunc(indio_dev->pollfunc);
-       iio_sw_rb_free(indio_dev->buffer);
+       iio_kfifo_free(indio_dev->buffer);
 }