Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi...

[~andy/linux] / drivers / iio / accel / st_accel_spi.c

diff --git a/drivers/iio/accel/st_accel_spi.c b/drivers/iio/accel/st_accel_spi.c
index 21ed9296311fcfb3301034b6023a3d9709122cc1..195639646e34261305de590f6c0cccd0bd898a85 100644 (file)
--- a/drivers/iio/accel/st_accel_spi.c
+++ b/drivers/iio/accel/st_accel_spi.c
@@ -24,11 +24,9 @@ static int st_accel_spi_probe(struct spi_device *spi)
        struct st_sensor_data *adata;
        int err;
 
-       indio_dev = iio_device_alloc(sizeof(*adata));
-       if (indio_dev == NULL) {
-               err = -ENOMEM;
-               goto iio_device_alloc_error;
-       }
+       indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*adata));
+       if (!indio_dev)
+               return -ENOMEM;
 
        adata = iio_priv(indio_dev);
        adata->dev = &spi->dev;
@@ -37,14 +35,9 @@ static int st_accel_spi_probe(struct spi_device *spi)
 
        err = st_accel_common_probe(indio_dev, spi->dev.platform_data);
        if (err < 0)
-               goto st_accel_common_probe_error;
+               return err;
 
        return 0;
-
-st_accel_common_probe_error:
-       iio_device_free(indio_dev);
-iio_device_alloc_error:
-       return err;
 }
 
 static int st_accel_spi_remove(struct spi_device *spi)