staging: iio: Add stubs for iio_ring_buffer_[un]register and equivalent driver stubs

Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Acked-by: Barry Song <21cnbao@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

3 files changed, 3 insertions, 26 deletions

diff --git a/drivers/staging/iio/adc/max1363.h b/drivers/staging/iio/adc/max1363.h
index bd35509b105..8f0fe1ced2c 100644
--- a/drivers/staging/iio/adc/max1363.h
+++ b/drivers/staging/iio/adc/max1363.h
@@ -230,26 +230,13 @@ int max1363_single_channel_from_ring(long mask, struct max1363_state *st);
 int max1363_register_ring_funcs_and_init(struct iio_dev *indio_dev);
 void max1363_ring_cleanup(struct iio_dev *indio_dev);
 
-int max1363_initialize_ring(struct iio_ring_buffer *ring);
-void max1363_uninitialize_ring(struct iio_ring_buffer *ring);
-
 #else /* CONFIG_MAX1363_RING_BUFFER */
 
-static inline void max1363_uninitialize_ring(struct iio_ring_buffer *ring)
-{
-}
-
-static inline int max1363_initialize_ring(struct iio_ring_buffer *ring)
-{
-        return 0;
-}
-
 int max1363_single_channel_from_ring(long mask, struct max1363_state *st)
 {
         return -EINVAL;
 }
 
-
 static inline int
 max1363_register_ring_funcs_and_init(struct iio_dev *indio_dev)
 {
diff --git a/drivers/staging/iio/adc/max1363_core.c b/drivers/staging/iio/adc/max1363_core.c
index c23485f24c5..6435e509dd5 100644
--- a/drivers/staging/iio/adc/max1363_core.c
+++ b/drivers/staging/iio/adc/max1363_core.c
@@ -1653,7 +1653,7 @@ static int __devinit max1363_probe(struct i2c_client *client,
         if (ret)
                 goto error_cleanup_ring;
         regdone = 1;
-        ret = max1363_initialize_ring(st->indio_dev->ring);
+        ret = iio_ring_buffer_register(st->indio_dev->ring, 0);
         if (ret)
                 goto error_cleanup_ring;
 
@@ -1671,7 +1671,7 @@ static int __devinit max1363_probe(struct i2c_client *client,
 
         return 0;
 error_uninit_ring:
-        max1363_uninitialize_ring(st->indio_dev->ring);
+        iio_ring_buffer_unregister(st->indio_dev->ring);
 error_cleanup_ring:
         max1363_ring_cleanup(st->indio_dev);
 error_free_available_scan_masks:
@@ -1700,7 +1700,7 @@ static int max1363_remove(struct i2c_client *client)
 
         if (st->chip_info->monitor_mode && client->irq)
                 iio_unregister_interrupt_line(st->indio_dev, 0);
-        max1363_uninitialize_ring(indio_dev->ring);
+        iio_ring_buffer_unregister(indio_dev->ring);
         max1363_ring_cleanup(indio_dev);
         kfree(st->indio_dev->available_scan_masks);
         iio_device_unregister(indio_dev);
diff --git a/drivers/staging/iio/adc/max1363_ring.c b/drivers/staging/iio/adc/max1363_ring.c
index f9d5101e53a..786b17a0d6b 100644
--- a/drivers/staging/iio/adc/max1363_ring.c
+++ b/drivers/staging/iio/adc/max1363_ring.c
@@ -224,13 +224,3 @@ void max1363_ring_cleanup(struct iio_dev *indio_dev)
         kfree(indio_dev->pollfunc);
         iio_sw_rb_free(indio_dev->ring);
 }
-
-void max1363_uninitialize_ring(struct iio_ring_buffer *ring)
-{
-        iio_ring_buffer_unregister(ring);
-}
-
-int max1363_initialize_ring(struct iio_ring_buffer *ring)
-{
-        return iio_ring_buffer_register(ring, 0);
-}