staging: iio: lis3l02dq: Use devm_iio_device_alloc

Using devm_iio_device_alloc makes code simpler.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>

diff --git a/drivers/staging/iio/accel/lis3l02dq_core.c b/drivers/staging/iio/accel/lis3l02dq_core.c
index 8ed75a94f4658b73babc284a5d3f3b87f63073a5..bb852dc9c9870c703d261734f5408770758cbb75 100644 (file)
--- a/drivers/staging/iio/accel/lis3l02dq_core.c
+++ b/drivers/staging/iio/accel/lis3l02dq_core.c
@@ -668,11 +668,9 @@ static int lis3l02dq_probe(struct spi_device *spi)
        struct lis3l02dq_state *st;
        struct iio_dev *indio_dev;
 
-       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);
@@ -690,7 +688,7 @@ static int lis3l02dq_probe(struct spi_device *spi)
 
        ret = lis3l02dq_configure_buffer(indio_dev);
        if (ret)
-               goto error_free_dev;
+               return ret;
 
        ret = iio_buffer_register(indio_dev,
                                  lis3l02dq_channels,
@@ -736,9 +734,6 @@ error_uninitialize_buffer:
        iio_buffer_unregister(indio_dev);
 error_unreg_buffer_funcs:
        lis3l02dq_unconfigure_buffer(indio_dev);
-error_free_dev:
-       iio_device_free(indio_dev);
-error_ret:
        return ret;
 }
 
@@ -786,8 +781,6 @@ static int lis3l02dq_remove(struct spi_device *spi)
        iio_buffer_unregister(indio_dev);
        lis3l02dq_unconfigure_buffer(indio_dev);
 
-       iio_device_free(indio_dev);
-
        return 0;
 }