iio: adis16201: Use Managed device functions
authorNuno Sá <nuno.sa@analog.com>
Tue, 15 Sep 2020 12:02:49 +0000 (14:02 +0200)
committerJonathan Cameron <Jonathan.Cameron@huawei.com>
Wed, 16 Sep 2020 18:06:07 +0000 (19:06 +0100)
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.

Since we are here, drop the `.remove` callback by further using devm
functions.

Signed-off-by: Nuno Sá <nuno.sa@analog.com>
Link: https://lore.kernel.org/r/20200915120258.161587-2-nuno.sa@analog.com
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
drivers/iio/accel/adis16201.c

index 59a24c355a1ab6a101c888672f2d0e8d4aefb14d..f955cccb3e779e4b42e81a924d362f1a2628386a 100644 (file)
@@ -281,34 +281,15 @@ static int adis16201_probe(struct spi_device *spi)
        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;
 
        ret = adis_initial_startup(st);
        if (ret)
-               goto error_cleanup_buffer_trigger;
-
-       ret = iio_device_register(indio_dev);
-       if (ret < 0)
-               goto error_cleanup_buffer_trigger;
-
-       return 0;
-
-error_cleanup_buffer_trigger:
-       adis_cleanup_buffer_and_trigger(st, indio_dev);
-       return ret;
-}
-
-static int adis16201_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 ret;
 
-       return 0;
+       return devm_iio_device_register(&spi->dev, indio_dev);
 }
 
 static struct spi_driver adis16201_driver = {
@@ -316,7 +297,6 @@ static struct spi_driver adis16201_driver = {
                .name = "adis16201",
        },
        .probe = adis16201_probe,
-       .remove = adis16201_remove,
 };
 module_spi_driver(adis16201_driver);