iio: magnetometer: st_magn: 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/magnetometer/st_magn_core.c b/drivers/iio/magnetometer/st_magn_core.c
index 7cd784f522e5526d7a8c20c91e98ae034e419d8c..e8d2849cc81d9110356691caaba587c80afff57e 100644 (file)
--- a/drivers/iio/magnetometer/st_magn_core.c
+++ b/drivers/iio/magnetometer/st_magn_core.c
@@ -407,7 +407,6 @@ void st_magn_common_remove(struct iio_dev *indio_dev)
                st_sensors_deallocate_trigger(indio_dev);
                st_magn_deallocate_ring(indio_dev);
        }
-       iio_device_free(indio_dev);
 }
 EXPORT_SYMBOL(st_magn_common_remove);
 

diff --git a/drivers/iio/magnetometer/st_magn_i2c.c b/drivers/iio/magnetometer/st_magn_i2c.c
index 1bed117714c584b3bdd91bb1fa7b477f1f67c5a6..892e0feeb5c1d936a319d348c318a22b41c06051 100644 (file)
--- a/drivers/iio/magnetometer/st_magn_i2c.c
+++ b/drivers/iio/magnetometer/st_magn_i2c.c
@@ -25,11 +25,9 @@ static int st_magn_i2c_probe(struct i2c_client *client,
        struct st_sensor_data *mdata;
        int err;
 
-       indio_dev = iio_device_alloc(sizeof(*mdata));
-       if (indio_dev == NULL) {
-               err = -ENOMEM;
-               goto iio_device_alloc_error;
-       }
+       indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*mdata));
+       if (!indio_dev)
+               return -ENOMEM;
 
        mdata = iio_priv(indio_dev);
        mdata->dev = &client->dev;
@@ -38,14 +36,9 @@ static int st_magn_i2c_probe(struct i2c_client *client,
 
        err = st_magn_common_probe(indio_dev, NULL);
        if (err < 0)
-               goto st_magn_common_probe_error;
+               return err;
 
        return 0;
-
-st_magn_common_probe_error:
-       iio_device_free(indio_dev);
-iio_device_alloc_error:
-       return err;
 }
 
 static int st_magn_i2c_remove(struct i2c_client *client)

diff --git a/drivers/iio/magnetometer/st_magn_spi.c b/drivers/iio/magnetometer/st_magn_spi.c
index a2333a1e6061d0566b706f905ca0a99f2c30176a..a6143ea51dfcb1d906e1a28bc85e7b40f92d8163 100644 (file)
--- a/drivers/iio/magnetometer/st_magn_spi.c
+++ b/drivers/iio/magnetometer/st_magn_spi.c
@@ -24,11 +24,9 @@ static int st_magn_spi_probe(struct spi_device *spi)
        struct st_sensor_data *mdata;
        int err;
 
-       indio_dev = iio_device_alloc(sizeof(*mdata));
-       if (indio_dev == NULL) {
-               err = -ENOMEM;
-               goto iio_device_alloc_error;
-       }
+       indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*mdata));
+       if (!indio_dev)
+               return -ENOMEM;
 
        mdata = iio_priv(indio_dev);
        mdata->dev = &spi->dev;
@@ -37,14 +35,9 @@ static int st_magn_spi_probe(struct spi_device *spi)
 
        err = st_magn_common_probe(indio_dev, NULL);
        if (err < 0)
-               goto st_magn_common_probe_error;
+               return err;
 
        return 0;
-
-st_magn_common_probe_error:
-       iio_device_free(indio_dev);
-iio_device_alloc_error:
-       return err;
 }
 
 static int st_magn_spi_remove(struct spi_device *spi)