[PATCH 09/10] staging: iio: adis16240: Use Managed device functions

[Nuno Sá]

Use the adis managed device functions to setup the buffer and the trigger.
The ultimate goal will be to completely drop the non devm version from
the lib.

Signed-off-by: Nuno Sá <nuno...@analog.com>
---
 drivers/staging/iio/accel/adis16240.c | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/drivers/staging/iio/accel/adis16240.c 
b/drivers/staging/iio/accel/adis16240.c
index 38ec40b458c9..26b57f0a3917 100644
--- a/drivers/staging/iio/accel/adis16240.c
+++ b/drivers/staging/iio/accel/adis16240.c
@@ -415,31 +415,23 @@ static int adis16240_probe(struct spi_device *spi)
        ret = adis_init(st, indio_dev, spi, &adis16240_data);
        if (ret)
                return ret;
-       ret = adis_setup_buffer_and_trigger(st, indio_dev, NULL);
+       ret = devm_adis_setup_buffer_and_trigger(st, indio_dev, NULL);
        if (ret)
                return ret;
 
        /* Get the device into a sane initial state */
        ret = adis_initial_startup(st);
        if (ret)
-               goto error_cleanup_buffer_trigger;
-       ret = iio_device_register(indio_dev);
-       if (ret)
-               goto error_cleanup_buffer_trigger;
-       return 0;
+               return ret;
 
-error_cleanup_buffer_trigger:
-       adis_cleanup_buffer_and_trigger(st, indio_dev);
-       return ret;
+       return iio_device_register(indio_dev);
 }
 
 static int adis16240_remove(struct spi_device *spi)
 {
        struct iio_dev *indio_dev = spi_get_drvdata(spi);
-       struct adis *st = iio_priv(indio_dev);
 
        iio_device_unregister(indio_dev);
-       adis_cleanup_buffer_and_trigger(st, indio_dev);
 
        return 0;
 }
-- 
2.28.0

_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel