staging: iio: adc: convert ADI drivers to use kfifo.

sw_ring is depreciated and therefore won't move out of staging.
Prerequisite for lifting affected drivers is to convert them to kfifo.
Update copyright.

Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/iio/adc/Kconfig b/drivers/staging/iio/adc/Kconfig
index 9ae5467ca4201325f7785b4d6c2495ef821ef972..2490dd25093b43cdc889de09d0bf264e81369ed8 100644 (file)
--- a/drivers/staging/iio/adc/Kconfig
+++ b/drivers/staging/iio/adc/Kconfig
@@ -25,7 +25,7 @@ config AD7606
        depends on GPIOLIB
        select IIO_BUFFER
        select IIO_TRIGGER
-       select IIO_SW_RING
+       select IIO_KFIFO_BUF
        help
          Say yes here to build support for Analog Devices:
          ad7606, ad7606-6, ad7606-4 analog to digital converters (ADC).
@@ -63,7 +63,7 @@ config AD799X_RING_BUFFER
        bool "Analog Devices AD799x: use ring buffer"
        depends on AD799X
        select IIO_BUFFER
-       select IIO_SW_RING
+       select IIO_KFIFO_BUF
        help
          Say yes here to include ring buffer support in the AD799X
          ADC driver.
@@ -72,7 +72,7 @@ config AD7476
        tristate "Analog Devices AD7475/6/7/8 AD7466/7/8 and AD7495 ADC driver"
        depends on SPI
        select IIO_BUFFER
-       select IIO_SW_RING
+       select IIO_KFIFO_BUF
        select IIO_TRIGGER
        help
          Say yes here to build support for Analog Devices
@@ -87,7 +87,7 @@ config AD7887
        tristate "Analog Devices AD7887 ADC driver"
        depends on SPI
        select IIO_BUFFER
-       select IIO_SW_RING
+       select IIO_KFIFO_BUF
        select IIO_TRIGGER
        help
          Say yes here to build support for Analog Devices
@@ -113,7 +113,7 @@ config AD7793
        tristate "Analog Devices AD7792 AD7793 ADC driver"
        depends on SPI
        select IIO_BUFFER
-       select IIO_SW_RING
+       select IIO_KFIFO_BUF
        select IIO_TRIGGER
        help
          Say yes here to build support for Analog Devices
@@ -135,7 +135,7 @@ config AD7192
        tristate "Analog Devices AD7190 AD7192 AD7195 ADC driver"
        depends on SPI
        select IIO_BUFFER
-       select IIO_SW_RING
+       select IIO_KFIFO_BUF
        select IIO_TRIGGER
        help
          Say yes here to build support for Analog Devices AD7190,

diff --git a/drivers/staging/iio/adc/ad7192.c b/drivers/staging/iio/adc/ad7192.c
index 7b44705acb7e4e958e4d7bd63ff5a7d58247b933..d5655e3b8efd7125da14f50fb9fe3595f89f355e 100644 (file)
--- a/drivers/staging/iio/adc/ad7192.c
+++ b/drivers/staging/iio/adc/ad7192.c
@@ -1,7 +1,7 @@
 /*
  * AD7190 AD7192 AD7195 SPI ADC driver
  *
- * Copyright 2011 Analog Devices Inc.
+ * Copyright 2011-2012 Analog Devices Inc.
  *
  * Licensed under the GPL-2.
  */
@@ -20,7 +20,7 @@
 #include <linux/iio/iio.h>
 #include <linux/iio/sysfs.h>
 #include <linux/iio/buffer.h>
-#include "../ring_sw.h"
+#include <linux/iio/kfifo_buf.h>
 #include <linux/iio/trigger.h>
 #include <linux/iio/trigger_consumer.h>
 
@@ -544,7 +544,7 @@ static int ad7192_register_ring_funcs_and_init(struct iio_dev *indio_dev)
 {
        int ret;
 
-       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;
@@ -557,7 +557,7 @@ static int ad7192_register_ring_funcs_and_init(struct iio_dev *indio_dev)
                                                 indio_dev->id);
        if (indio_dev->pollfunc == NULL) {
                ret = -ENOMEM;
-               goto error_deallocate_sw_rb;
+               goto error_deallocate_kfifo;
        }
 
        /* Ring buffer functions - here trigger setup related */
@@ -567,8 +567,8 @@ static int ad7192_register_ring_funcs_and_init(struct iio_dev *indio_dev)
        indio_dev->modes |= INDIO_BUFFER_TRIGGERED;
        return 0;
 
-error_deallocate_sw_rb:
-       iio_sw_rb_free(indio_dev->buffer);
+error_deallocate_kfifo:
+       iio_kfifo_free(indio_dev->buffer);
 error_ret:
        return ret;
 }
@@ -576,7 +576,7 @@ error_ret:
 static void ad7192_ring_cleanup(struct iio_dev *indio_dev)
 {
        iio_dealloc_pollfunc(indio_dev->pollfunc);
-       iio_sw_rb_free(indio_dev->buffer);
+       iio_kfifo_free(indio_dev->buffer);
 }
 
 /**

diff --git a/drivers/staging/iio/adc/ad7298_ring.c b/drivers/staging/iio/adc/ad7298_ring.c
index 943caa340bfaf1b645eb38760fc3e2362c195155..908a3e5609dfd5cf91787a0038f908f3927e04e4 100644 (file)
--- a/drivers/staging/iio/adc/ad7298_ring.c
+++ b/drivers/staging/iio/adc/ad7298_ring.c
@@ -1,7 +1,7 @@
 /*
  * AD7298 SPI ADC driver
  *
- * Copyright 2011 Analog Devices Inc.
+ * Copyright 2011-2012 Analog Devices Inc.
  *
  * Licensed under the GPL-2.
  */
@@ -13,7 +13,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 "ad7298.h"
@@ -118,7 +118,7 @@ int ad7298_register_ring_funcs_and_init(struct iio_dev *indio_dev)
 {
        int ret;
 
-       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;
@@ -132,7 +132,7 @@ int ad7298_register_ring_funcs_and_init(struct iio_dev *indio_dev)
 
        if (indio_dev->pollfunc == NULL) {
                ret = -ENOMEM;
-               goto error_deallocate_sw_rb;
+               goto error_deallocate_kfifo;
        }
 
        /* Ring buffer functions - here trigger setup related */
@@ -143,8 +143,8 @@ int ad7298_register_ring_funcs_and_init(struct iio_dev *indio_dev)
        indio_dev->modes |= INDIO_BUFFER_TRIGGERED;
        return 0;
 
-error_deallocate_sw_rb:
-       iio_sw_rb_free(indio_dev->buffer);
+error_deallocate_kfifo:
+       iio_kfifo_free(indio_dev->buffer);
 error_ret:
        return ret;
 }
@@ -152,5 +152,5 @@ error_ret:
 void ad7298_ring_cleanup(struct iio_dev *indio_dev)
 {
        iio_dealloc_pollfunc(indio_dev->pollfunc);
-       iio_sw_rb_free(indio_dev->buffer);
+       iio_kfifo_free(indio_dev->buffer);
 }

diff --git a/drivers/staging/iio/adc/ad7476_ring.c b/drivers/staging/iio/adc/ad7476_ring.c
index 51403892bc8bf6091fd6beb03faa2cbc435b5344..383611b05764658d6a36d008ab4e857674ccc81a 100644 (file)
--- a/drivers/staging/iio/adc/ad7476_ring.c
+++ b/drivers/staging/iio/adc/ad7476_ring.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 Analog Devices Inc.
+ * Copyright 2010-2012 Analog Devices Inc.
  * Copyright (C) 2008 Jonathan Cameron
  *
  * Licensed under the GPL-2 or later.
@@ -15,7 +15,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 "ad7476.h"
@@ -63,7 +63,7 @@ int ad7476_register_ring_funcs_and_init(struct iio_dev *indio_dev)
        struct ad7476_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;
@@ -78,7 +78,7 @@ int ad7476_register_ring_funcs_and_init(struct iio_dev *indio_dev)
                                     indio_dev->id);
        if (indio_dev->pollfunc == NULL) {
                ret = -ENOMEM;
-               goto error_deallocate_sw_rb;
+               goto error_deallocate_kfifo;
        }
 
        /* Ring buffer functions - here trigger setup related */
@@ -89,8 +89,8 @@ int ad7476_register_ring_funcs_and_init(struct iio_dev *indio_dev)
        indio_dev->modes |= INDIO_BUFFER_TRIGGERED;
        return 0;
 
-error_deallocate_sw_rb:
-       iio_sw_rb_free(indio_dev->buffer);
+error_deallocate_kfifo:
+       iio_kfifo_free(indio_dev->buffer);
 error_ret:
        return ret;
 }
@@ -98,5 +98,5 @@ error_ret:
 void ad7476_ring_cleanup(struct iio_dev *indio_dev)
 {
        iio_dealloc_pollfunc(indio_dev->pollfunc);
-       iio_sw_rb_free(indio_dev->buffer);
+       iio_kfifo_free(indio_dev->buffer);
 }

diff --git a/drivers/staging/iio/adc/ad7606_ring.c b/drivers/staging/iio/adc/ad7606_ring.c
index 3dd9602b1070d343e832c995d84ffa7a4a4dec0e..24ce8fc71646de5b6df60b1a5d4e2358b73ad4db 100644 (file)
--- a/drivers/staging/iio/adc/ad7606_ring.c
+++ b/drivers/staging/iio/adc/ad7606_ring.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 Analog Devices Inc.
+ * Copyright 2011-2012 Analog Devices Inc.
  *
  * Licensed under the GPL-2.
  *
@@ -13,7 +13,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 "ad7606.h"
@@ -102,7 +102,7 @@ int ad7606_register_ring_funcs_and_init(struct iio_dev *indio_dev)
        struct ad7606_state *st = iio_priv(indio_dev);
        int ret;
 
-       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;
@@ -117,13 +117,13 @@ int ad7606_register_ring_funcs_and_init(struct iio_dev *indio_dev)
                                                 indio_dev->id);
        if (indio_dev->pollfunc == NULL) {
                ret = -ENOMEM;
-               goto error_deallocate_sw_rb;
+               goto error_deallocate_kfifo;
        }
 
        /* Ring buffer functions - here trigger setup related */
 
        indio_dev->setup_ops = &ad7606_ring_setup_ops;
-       indio_dev->buffer->scan_timestamp = true ;
+       indio_dev->buffer->scan_timestamp = true;
 
        INIT_WORK(&st->poll_work, &ad7606_poll_bh_to_ring);
 
@@ -131,8 +131,8 @@ int ad7606_register_ring_funcs_and_init(struct iio_dev *indio_dev)
        indio_dev->modes |= INDIO_BUFFER_TRIGGERED;
        return 0;
 
-error_deallocate_sw_rb:
-       iio_sw_rb_free(indio_dev->buffer);
+error_deallocate_kfifo:
+       iio_kfifo_free(indio_dev->buffer);
 error_ret:
        return ret;
 }
@@ -140,5 +140,5 @@ error_ret:
 void ad7606_ring_cleanup(struct iio_dev *indio_dev)
 {
        iio_dealloc_pollfunc(indio_dev->pollfunc);
-       iio_sw_rb_free(indio_dev->buffer);
+       iio_kfifo_free(indio_dev->buffer);
 }

diff --git a/drivers/staging/iio/adc/ad7793.c b/drivers/staging/iio/adc/ad7793.c
index 8ffdd800bcd9056aa885d10b03213a0bd49ee419..61df7964f9493567079f8eea6ba48c647cea50ee 100644 (file)
--- a/drivers/staging/iio/adc/ad7793.c
+++ b/drivers/staging/iio/adc/ad7793.c
@@ -1,7 +1,7 @@
 /*
  * AD7792/AD7793 SPI ADC driver
  *
- * Copyright 2011 Analog Devices Inc.
+ * Copyright 2011-2012 Analog Devices Inc.
  *
  * Licensed under the GPL-2.
  */
@@ -21,7 +21,7 @@
 #include <linux/iio/iio.h>
 #include <linux/iio/sysfs.h>
 #include <linux/iio/buffer.h>
-#include "../ring_sw.h"
+#include <linux/iio/kfifo_buf.h>
 #include <linux/iio/trigger.h>
 #include <linux/iio/trigger_consumer.h>
 
@@ -409,7 +409,7 @@ static int ad7793_register_ring_funcs_and_init(struct iio_dev *indio_dev)
 {
        int ret;
 
-       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;
@@ -422,7 +422,7 @@ static int ad7793_register_ring_funcs_and_init(struct iio_dev *indio_dev)
                                                 indio_dev->id);
        if (indio_dev->pollfunc == NULL) {
                ret = -ENOMEM;
-               goto error_deallocate_sw_rb;
+               goto error_deallocate_kfifo;
        }
 
        /* Ring buffer functions - here trigger setup related */
@@ -432,8 +432,8 @@ static int ad7793_register_ring_funcs_and_init(struct iio_dev *indio_dev)
        indio_dev->modes |= INDIO_BUFFER_TRIGGERED;
        return 0;
 
-error_deallocate_sw_rb:
-       iio_sw_rb_free(indio_dev->buffer);
+error_deallocate_kfifo:
+       iio_kfifo_free(indio_dev->buffer);
 error_ret:
        return ret;
 }
@@ -441,7 +441,7 @@ error_ret:
 static void ad7793_ring_cleanup(struct iio_dev *indio_dev)
 {
        iio_dealloc_pollfunc(indio_dev->pollfunc);
-       iio_sw_rb_free(indio_dev->buffer);
+       iio_kfifo_free(indio_dev->buffer);
 }
 
 /**

diff --git a/drivers/staging/iio/adc/ad7887_ring.c b/drivers/staging/iio/adc/ad7887_ring.c
index f1846dbf49a04d8be1275020205b468a768ff49a..fd91384db894e5b559d911012cc00605b18a806c 100644 (file)
--- a/drivers/staging/iio/adc/ad7887_ring.c
+++ b/drivers/staging/iio/adc/ad7887_ring.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2011 Analog Devices Inc.
+ * Copyright 2010-2012 Analog Devices Inc.
  * Copyright (C) 2008 Jonathan Cameron
  *
  * Licensed under the GPL-2.
@@ -14,7 +14,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 "ad7887.h"
@@ -114,7 +114,7 @@ int ad7887_register_ring_funcs_and_init(struct iio_dev *indio_dev)
 {
        int ret;
 
-       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;
@@ -127,7 +127,7 @@ int ad7887_register_ring_funcs_and_init(struct iio_dev *indio_dev)
                                                 indio_dev->id);
        if (indio_dev->pollfunc == NULL) {
                ret = -ENOMEM;
-               goto error_deallocate_sw_rb;
+               goto error_deallocate_kfifo;
        }
        /* Ring buffer functions - here trigger setup related */
        indio_dev->setup_ops = &ad7887_ring_setup_ops;
@@ -136,8 +136,8 @@ int ad7887_register_ring_funcs_and_init(struct iio_dev *indio_dev)
        indio_dev->modes |= INDIO_BUFFER_TRIGGERED;
        return 0;
 
-error_deallocate_sw_rb:
-       iio_sw_rb_free(indio_dev->buffer);
+error_deallocate_kfifo:
+       iio_kfifo_free(indio_dev->buffer);
 error_ret:
        return ret;
 }
@@ -145,5 +145,5 @@ error_ret:
 void ad7887_ring_cleanup(struct iio_dev *indio_dev)
 {
        iio_dealloc_pollfunc(indio_dev->pollfunc);
-       iio_sw_rb_free(indio_dev->buffer);
+       iio_kfifo_free(indio_dev->buffer);
 }

diff --git a/drivers/staging/iio/adc/ad799x_ring.c b/drivers/staging/iio/adc/ad799x_ring.c
index 18366b5038cefec0849279b40a5bddac06bce4b0..1c7ff4423db45f1fd8acebdc3b3e832ead0bcf05 100644 (file)
--- a/drivers/staging/iio/adc/ad799x_ring.c
+++ b/drivers/staging/iio/adc/ad799x_ring.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Michael Hennerich, Analog Devices Inc.
+ * Copyright (C) 2010-2012 Michael Hennerich, Analog Devices Inc.
  * Copyright (C) 2008-2010 Jonathan Cameron
  *
  * This program is free software; you can redistribute it and/or modify
@@ -18,7 +18,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 "ad799x.h"
@@ -120,7 +120,7 @@ int ad799x_register_ring_funcs_and_init(struct iio_dev *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;
@@ -134,7 +134,7 @@ int ad799x_register_ring_funcs_and_init(struct iio_dev *indio_dev)
                                                 indio_dev->id);
        if (indio_dev->pollfunc == NULL) {
                ret = -ENOMEM;
-               goto error_deallocate_sw_rb;
+               goto error_deallocate_kfifo;
        }
 
        /* Ring buffer functions - here trigger setup related */
@@ -145,8 +145,8 @@ int ad799x_register_ring_funcs_and_init(struct iio_dev *indio_dev)
        indio_dev->modes |= INDIO_BUFFER_TRIGGERED;
        return 0;
 
-error_deallocate_sw_rb:
-       iio_sw_rb_free(indio_dev->buffer);
+error_deallocate_kfifo:
+       iio_kfifo_free(indio_dev->buffer);
 error_ret:
        return ret;
 }
@@ -154,5 +154,5 @@ error_ret:
 void ad799x_ring_cleanup(struct iio_dev *indio_dev)
 {
        iio_dealloc_pollfunc(indio_dev->pollfunc);
-       iio_sw_rb_free(indio_dev->buffer);
+       iio_kfifo_free(indio_dev->buffer);
 }