iio: accel: st_accel: Use devm_iio_device_alloc

Using devm_iio_device_alloc makes code simpler.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Cc: Denis Ciocca <denis.ciocca@st.com>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>

diff --git a/drivers/iio/accel/st_accel_core.c b/drivers/iio/accel/st_accel_core.c
index aef3c9be73665ee4c4d3d434d23dd626ad6e724d..1458343f6f3fac94f5aa882df1e88d2d9ac37ad1 100644 (file)
--- a/drivers/iio/accel/st_accel_core.c
+++ b/drivers/iio/accel/st_accel_core.c
@@ -517,7 +517,6 @@ void st_accel_common_remove(struct iio_dev *indio_dev)
                st_sensors_deallocate_trigger(indio_dev);
                st_accel_deallocate_ring(indio_dev);
        }
-       iio_device_free(indio_dev);
 }
 EXPORT_SYMBOL(st_accel_common_remove);
 

diff --git a/drivers/iio/accel/st_accel_i2c.c b/drivers/iio/accel/st_accel_i2c.c
index 58d164d90dca17328c6fdc7a9a3c79fc883116df..d7bedbdfc81dff86bf050d01c23d3d23419abec7 100644 (file)
--- a/drivers/iio/accel/st_accel_i2c.c
+++ b/drivers/iio/accel/st_accel_i2c.c
@@ -25,11 +25,9 @@ static int st_accel_i2c_probe(struct i2c_client *client,
        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(&client->dev, sizeof(*adata));
+       if (!indio_dev)
+               return -ENOMEM;
 
        adata = iio_priv(indio_dev);
        adata->dev = &client->dev;
@@ -38,14 +36,9 @@ static int st_accel_i2c_probe(struct i2c_client *client,
 
        err = st_accel_common_probe(indio_dev, client->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_i2c_remove(struct i2c_client *client)

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)