staging: iio: push the main buffer chrdev down to the top level.

[mirror_ubuntu-bionic-kernel.git] / drivers / staging / iio / accel / adis16240_core.c

diff --git a/drivers/staging/iio/accel/adis16240_core.c b/drivers/staging/iio/accel/adis16240_core.c
index aee8b69173c440f581774738c7a51b5ae1c1e46b..2c6ced0366d351ae8371d667807e25a74600e129 100644 (file)
--- a/drivers/staging/iio/accel/adis16240_core.c
+++ b/drivers/staging/iio/accel/adis16240_core.c
@@ -17,12 +17,11 @@
 #include <linux/slab.h>
 #include <linux/sysfs.h>
 #include <linux/list.h>
+#include <linux/module.h>
 
 #include "../iio.h"
 #include "../sysfs.h"
 #include "../ring_generic.h"
-#include "accel.h"
-#include "../adc/adc.h"
 
 #include "adis16240.h"
 
@@ -553,7 +552,7 @@ static int __devinit adis16240_probe(struct spi_device *spi)
                goto error_unreg_ring_funcs;
        regdone = 1;
 
-       ret = iio_ring_buffer_register_ex(indio_dev->ring, 0,
+       ret = iio_ring_buffer_register_ex(indio_dev, 0,
                                          adis16240_channels,
                                          ARRAY_SIZE(adis16240_channels));
        if (ret) {
@@ -576,7 +575,7 @@ static int __devinit adis16240_probe(struct spi_device *spi)
 error_remove_trigger:
        adis16240_remove_trigger(indio_dev);
 error_uninitialize_ring:
-       iio_ring_buffer_unregister(indio_dev->ring);
+       iio_ring_buffer_unregister(indio_dev);
 error_unreg_ring_funcs:
        adis16240_unconfigure_ring(indio_dev);
 error_free_dev:
@@ -596,7 +595,7 @@ static int adis16240_remove(struct spi_device *spi)
        flush_scheduled_work();
 
        adis16240_remove_trigger(indio_dev);
-       iio_ring_buffer_unregister(indio_dev->ring);
+       iio_ring_buffer_unregister(indio_dev);
        iio_device_unregister(indio_dev);
        adis16240_unconfigure_ring(indio_dev);