8 files changed, 12 insertions, 68 deletions

diff --git a/drivers/staging/iio/imu/adis16300_core.c b/drivers/staging/iio/imu/adis16300_core.c
index 28667e8f26c..f1950d56cb1 100644
--- a/drivers/staging/iio/imu/adis16300_core.c
+++ b/drivers/staging/iio/imu/adis16300_core.c
@@ -20,6 +20,7 @@
 
 #include "../iio.h"
 #include "../sysfs.h"
+#include "../ring_generic.h"
 #include "../accel/accel.h"
 #include "../accel/inclinometer.h"
 #include "../gyro/gyro.h"
@@ -644,7 +645,7 @@ static int __devinit adis16300_probe(struct spi_device *spi)
                 goto error_unreg_ring_funcs;
         regdone = 1;
 
-        ret = adis16300_initialize_ring(st->indio_dev->ring);
+        ret = iio_ring_buffer_register(st->indio_dev->ring, 0);
         if (ret) {
                 printk(KERN_ERR "failed to initialize the ring\n");
                 goto error_unreg_ring_funcs;
@@ -676,7 +677,7 @@ error_unregister_line:
         if (spi->irq)
                 iio_unregister_interrupt_line(st->indio_dev, 0);
 error_uninitialize_ring:
-        adis16300_uninitialize_ring(st->indio_dev->ring);
+        iio_ring_buffer_unregister(st->indio_dev->ring);
 error_unreg_ring_funcs:
         adis16300_unconfigure_ring(st->indio_dev);
 error_free_dev:
@@ -710,7 +711,7 @@ static int adis16300_remove(struct spi_device *spi)
         if (spi->irq)
                 iio_unregister_interrupt_line(indio_dev, 0);
 
-        adis16300_uninitialize_ring(indio_dev->ring);
+        iio_ring_buffer_unregister(indio_dev->ring);
         iio_device_unregister(indio_dev);
         adis16300_unconfigure_ring(indio_dev);
         kfree(st->tx);
diff --git a/drivers/staging/iio/imu/adis16300_ring.c b/drivers/staging/iio/imu/adis16300_ring.c
index a76d43cd209..3bf9904f7d7 100644
--- a/drivers/staging/iio/imu/adis16300_ring.c
+++ b/drivers/staging/iio/imu/adis16300_ring.c
@@ -241,12 +241,3 @@ error_iio_sw_rb_free:
         return ret;
 }
 
-int adis16300_initialize_ring(struct iio_ring_buffer *ring)
-{
-        return iio_ring_buffer_register(ring, 0);
-}
-
-void adis16300_uninitialize_ring(struct iio_ring_buffer *ring)
-{
-        iio_ring_buffer_unregister(ring);
-}
diff --git a/drivers/staging/iio/imu/adis16350.h b/drivers/staging/iio/imu/adis16350.h
index b4533a0e0ef..d94f6ab57fb 100644
--- a/drivers/staging/iio/imu/adis16350.h
+++ b/drivers/staging/iio/imu/adis16350.h
@@ -148,8 +148,6 @@ ssize_t adis16350_read_data_from_ring(struct device *dev,
 int adis16350_configure_ring(struct iio_dev *indio_dev);
 void adis16350_unconfigure_ring(struct iio_dev *indio_dev);
 
-int adis16350_initialize_ring(struct iio_ring_buffer *ring);
-void adis16350_uninitialize_ring(struct iio_ring_buffer *ring);
 #else /* CONFIG_IIO_RING_BUFFER */
 
 static inline void adis16350_remove_trigger(struct iio_dev *indio_dev)
@@ -169,23 +167,5 @@ adis16350_read_data_from_ring(struct device *dev,
         return 0;
 }
 
-static int adis16350_configure_ring(struct iio_dev *indio_dev)
-{
-        return 0;
-}
-
-static inline void adis16350_unconfigure_ring(struct iio_dev *indio_dev)
-{
-}
-
-static inline int adis16350_initialize_ring(struct iio_ring_buffer *ring)
-{
-        return 0;
-}
-
-static inline void adis16350_uninitialize_ring(struct iio_ring_buffer *ring)
-{
-}
-
 #endif /* CONFIG_IIO_RING_BUFFER */
 #endif /* SPI_ADIS16350_H_ */
diff --git a/drivers/staging/iio/imu/adis16350_core.c b/drivers/staging/iio/imu/adis16350_core.c
index 0bb19a9d12f..1575b7b5d44 100644
--- a/drivers/staging/iio/imu/adis16350_core.c
+++ b/drivers/staging/iio/imu/adis16350_core.c
@@ -20,6 +20,7 @@
 
 #include "../iio.h"
 #include "../sysfs.h"
+#include "../ring_generic.h"
 #include "../accel/accel.h"
 #include "../adc/adc.h"
 #include "../gyro/gyro.h"
@@ -619,7 +620,7 @@ static int __devinit adis16350_probe(struct spi_device *spi)
                 goto error_unreg_ring_funcs;
         regdone = 1;
 
-        ret = adis16350_initialize_ring(st->indio_dev->ring);
+        ret = iio_ring_buffer_register(st->indio_dev->ring, 0);
         if (ret) {
                 printk(KERN_ERR "failed to initialize the ring\n");
                 goto error_unreg_ring_funcs;
@@ -651,7 +652,7 @@ error_unregister_line:
         if (spi->irq)
                 iio_unregister_interrupt_line(st->indio_dev, 0);
 error_uninitialize_ring:
-        adis16350_uninitialize_ring(st->indio_dev->ring);
+        iio_ring_buffer_unregister(st->indio_dev->ring);
 error_unreg_ring_funcs:
         adis16350_unconfigure_ring(st->indio_dev);
 error_free_dev:
@@ -685,7 +686,7 @@ static int adis16350_remove(struct spi_device *spi)
         if (spi->irq)
                 iio_unregister_interrupt_line(indio_dev, 0);
 
-        adis16350_uninitialize_ring(indio_dev->ring);
+        iio_ring_buffer_unregister(indio_dev->ring);
         iio_device_unregister(indio_dev);
         adis16350_unconfigure_ring(indio_dev);
         kfree(st->tx);
diff --git a/drivers/staging/iio/imu/adis16350_ring.c b/drivers/staging/iio/imu/adis16350_ring.c
index ca4f685d2f5..319aa34b19c 100644
--- a/drivers/staging/iio/imu/adis16350_ring.c
+++ b/drivers/staging/iio/imu/adis16350_ring.c
@@ -246,12 +246,3 @@ error_iio_sw_rb_free:
         return ret;
 }
 
-int adis16350_initialize_ring(struct iio_ring_buffer *ring)
-{
-        return iio_ring_buffer_register(ring, 0);
-}
-
-void adis16350_uninitialize_ring(struct iio_ring_buffer *ring)
-{
-        iio_ring_buffer_unregister(ring);
-}
diff --git a/drivers/staging/iio/imu/adis16400.h b/drivers/staging/iio/imu/adis16400.h
index f74faee1d29..0685195b351 100644
--- a/drivers/staging/iio/imu/adis16400.h
+++ b/drivers/staging/iio/imu/adis16400.h
@@ -178,8 +178,6 @@ ssize_t adis16400_read_data_from_ring(struct device *dev,
 int adis16400_configure_ring(struct iio_dev *indio_dev);
 void adis16400_unconfigure_ring(struct iio_dev *indio_dev);
 
-int adis16400_initialize_ring(struct iio_ring_buffer *ring);
-void adis16400_uninitialize_ring(struct iio_ring_buffer *ring);
 #else /* CONFIG_IIO_RING_BUFFER */
 
 static inline void adis16400_remove_trigger(struct iio_dev *indio_dev)
@@ -208,14 +206,5 @@ static inline void adis16400_unconfigure_ring(struct iio_dev *indio_dev)
 {
 }
 
-static inline int adis16400_initialize_ring(struct iio_ring_buffer *ring)
-{
-        return 0;
-}
-
-static inline void adis16400_uninitialize_ring(struct iio_ring_buffer *ring)
-{
-}
-
 #endif /* CONFIG_IIO_RING_BUFFER */
 #endif /* SPI_ADIS16400_H_ */
diff --git a/drivers/staging/iio/imu/adis16400_core.c b/drivers/staging/iio/imu/adis16400_core.c
index 160585fab31..6013fee218e 100644
--- a/drivers/staging/iio/imu/adis16400_core.c
+++ b/drivers/staging/iio/imu/adis16400_core.c
@@ -27,6 +27,7 @@
 
 #include "../iio.h"
 #include "../sysfs.h"
+#include "../ring_generic.h"
 #include "../accel/accel.h"
 #include "../adc/adc.h"
 #include "../gyro/gyro.h"
@@ -641,7 +642,7 @@ static int __devinit adis16400_probe(struct spi_device *spi)
                 goto error_unreg_ring_funcs;
         regdone = 1;
 
-        ret = adis16400_initialize_ring(st->indio_dev->ring);
+        ret = iio_ring_buffer_register(st->indio_dev->ring, 0);
         if (ret) {
                 printk(KERN_ERR "failed to initialize the ring\n");
                 goto error_unreg_ring_funcs;
@@ -674,7 +675,7 @@ error_unregister_line:
         if (st->indio_dev->modes & INDIO_RING_TRIGGERED)
                 iio_unregister_interrupt_line(st->indio_dev, 0);
 error_uninitialize_ring:
-        adis16400_uninitialize_ring(st->indio_dev->ring);
+        iio_ring_buffer_unregister(st->indio_dev->ring);
 error_unreg_ring_funcs:
         adis16400_unconfigure_ring(st->indio_dev);
 error_free_dev:
@@ -709,7 +710,7 @@ static int adis16400_remove(struct spi_device *spi)
         if (spi->irq && gpio_is_valid(irq_to_gpio(spi->irq)) > 0)
                 iio_unregister_interrupt_line(indio_dev, 0);
 
-        adis16400_uninitialize_ring(indio_dev->ring);
+        iio_ring_buffer_unregister(st->indio_dev->ring);
         adis16400_unconfigure_ring(indio_dev);
         iio_device_unregister(indio_dev);
         kfree(st->tx);
diff --git a/drivers/staging/iio/imu/adis16400_ring.c b/drivers/staging/iio/imu/adis16400_ring.c
index 59d62a78096..c7744efefd7 100644
--- a/drivers/staging/iio/imu/adis16400_ring.c
+++ b/drivers/staging/iio/imu/adis16400_ring.c
@@ -252,13 +252,3 @@ error_iio_sw_rb_free:
         iio_sw_rb_free(indio_dev->ring);
         return ret;
 }
-
-int adis16400_initialize_ring(struct iio_ring_buffer *ring)
-{
-        return iio_ring_buffer_register(ring, 0);
-}
-
-void adis16400_uninitialize_ring(struct iio_ring_buffer *ring)
-{
-        iio_ring_buffer_unregister(ring);
-}