[PATCH 04/10] iio: adis16260: 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/gyro/adis16260.c | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/drivers/iio/gyro/adis16260.c b/drivers/iio/gyro/adis16260.c
index e638d56e1574..a515925e3356 100644
--- a/drivers/iio/gyro/adis16260.c
+++ b/drivers/iio/gyro/adis16260.c
@@ -390,33 +390,24 @@ static int adis16260_probe(struct spi_device *spi)
        if (ret)
                return ret;
 
-       ret = adis_setup_buffer_and_trigger(&adis16260->adis, indio_dev, NULL);
+       ret = devm_adis_setup_buffer_and_trigger(&adis16260->adis, indio_dev, 
NULL);
        if (ret)
                return ret;
 
        /* Get the device into a sane initial state */
        ret = adis_initial_startup(&adis16260->adis);
        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(&adis16260->adis, indio_dev);
-       return ret;
+       return iio_device_register(indio_dev);
 }
 
 static int adis16260_remove(struct spi_device *spi)
 {
        struct iio_dev *indio_dev = spi_get_drvdata(spi);
-       struct adis16260 *adis16260 = iio_priv(indio_dev);
 
        iio_device_unregister(indio_dev);
        adis16260_stop_device(indio_dev);
-       adis_cleanup_buffer_and_trigger(&adis16260->adis, indio_dev);
 
        return 0;
 }
-- 
2.28.0

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