[PATCH 06/10] iio: adis16460: 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/iio/imu/adis16460.c | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/drivers/iio/imu/adis16460.c b/drivers/iio/imu/adis16460.c
index b26a5f1bc51a..5c04cef173a8 100644
--- a/drivers/iio/imu/adis16460.c
+++ b/drivers/iio/imu/adis16460.c
@@ -403,7 +403,7 @@ static int adis16460_probe(struct spi_device *spi)
        if (ret)
                return ret;
 
-       ret = adis_setup_buffer_and_trigger(&st->adis, indio_dev, NULL);
+       ret = devm_adis_setup_buffer_and_trigger(&st->adis, indio_dev, NULL);
        if (ret)
                return ret;
 
@@ -411,30 +411,23 @@ static int adis16460_probe(struct spi_device *spi)
 
        ret = __adis_initial_startup(&st->adis);
        if (ret)
-               goto error_cleanup_buffer;
+               return ret;
 
        ret = iio_device_register(indio_dev);
        if (ret)
-               goto error_cleanup_buffer;
+               return ret;
 
        adis16460_debugfs_init(indio_dev);
 
        return 0;
-
-error_cleanup_buffer:
-       adis_cleanup_buffer_and_trigger(&st->adis, indio_dev);
-       return ret;
 }
 
 static int adis16460_remove(struct spi_device *spi)
 {
        struct iio_dev *indio_dev = spi_get_drvdata(spi);
-       struct adis16460 *st = iio_priv(indio_dev);
 
        iio_device_unregister(indio_dev);
 
-       adis_cleanup_buffer_and_trigger(&st->adis, indio_dev);
-
        return 0;
 }
 
-- 
2.28.0

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