1 files changed, 4 insertions, 17 deletions

diff --git a/drivers/iio/gyro/adis16080.c b/drivers/iio/gyro/adis16080.c
index e1bb5f994a54..e9ec022ae225 100644
--- a/drivers/iio/gyro/adis16080.c
+++ b/drivers/iio/gyro/adis16080.c
@@ -192,16 +192,13 @@ static const struct adis16080_chip_info adis16080_chip_info[] = {
 static int adis16080_probe(struct spi_device *spi)
 {
         const struct spi_device_id *id = spi_get_device_id(spi);
-        int ret;
         struct adis16080_state *st;
         struct iio_dev *indio_dev;
 
         /* setup the industrialio driver allocated elements */
-        indio_dev = iio_device_alloc(sizeof(*st));
-        if (indio_dev == NULL) {
-                ret = -ENOMEM;
-                goto error_ret;
-        }
+        indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*st));
+        if (!indio_dev)
+                return -ENOMEM;
         st = iio_priv(indio_dev);
         /* this is only used for removal purposes */
         spi_set_drvdata(spi, indio_dev);
@@ -217,22 +214,12 @@ static int adis16080_probe(struct spi_device *spi)
         indio_dev->info = &adis16080_info;
         indio_dev->modes = INDIO_DIRECT_MODE;
 
-        ret = iio_device_register(indio_dev);
-        if (ret)
-                goto error_free_dev;
-        return 0;
-
-error_free_dev:
-        iio_device_free(indio_dev);
-error_ret:
-        return ret;
+        return iio_device_register(indio_dev);
 }
 
 static int adis16080_remove(struct spi_device *spi)
 {
         iio_device_unregister(spi_get_drvdata(spi));
-        iio_device_free(spi_get_drvdata(spi));
-
         return 0;
 }