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/adis16480.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/drivers/iio/imu/adis16480.c b/drivers/iio/imu/adis16480.c
index 1eb4f98076f1..b6a129a70d4b 100644
--- a/drivers/iio/imu/adis16480.c
+++ b/drivers/iio/imu/adis16480.c
@@ -1264,20 +1264,18 @@ static int adis16480_probe(struct spi_device *spi)
                st->clk_freq = st->chip_info->int_clk;
        }
 
-       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)
                goto error_clk_disable_unprepare;
 
        ret = iio_device_register(indio_dev);
        if (ret)
-               goto error_cleanup_buffer;
+               goto error_clk_disable_unprepare;
 
        adis16480_debugfs_init(indio_dev);
 
        return 0;
 
-error_cleanup_buffer:
-       adis_cleanup_buffer_and_trigger(&st->adis, indio_dev);
 error_clk_disable_unprepare:
        clk_disable_unprepare(st->ext_clk);
 error_stop_device:
@@ -1293,7 +1291,6 @@ static int adis16480_remove(struct spi_device *spi)
        iio_device_unregister(indio_dev);
        adis16480_stop_device(indio_dev);
 
-       adis_cleanup_buffer_and_trigger(&st->adis, indio_dev);
        clk_disable_unprepare(st->ext_clk);
 
        return 0;
-- 
2.28.0

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

Reply via email to