iio: adc: ti_am335x_adc: Use devm_iio_device_alloc

Using devm_iio_device_alloc makes code simpler.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Cc: Rachna Patil <rachna@ti.com>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>

diff --git a/drivers/iio/adc/ti_am335x_adc.c b/drivers/iio/adc/ti_am335x_adc.c
index 0ad208a69c298aef50bb4b0ff6744b60753e9a08..b53867cb9cdc5e3148c5135aa2a4f0d2b4addd58 100644 (file)
--- a/drivers/iio/adc/ti_am335x_adc.c
+++ b/drivers/iio/adc/ti_am335x_adc.c
@@ -202,11 +202,11 @@ static int tiadc_probe(struct platform_device *pdev)
                return -EINVAL;
        }
 
-       indio_dev = iio_device_alloc(sizeof(struct tiadc_device));
+       indio_dev = devm_iio_device_alloc(&pdev->dev,
+                                         sizeof(struct tiadc_device));
        if (indio_dev == NULL) {
                dev_err(&pdev->dev, "failed to allocate iio device\n");
-               err = -ENOMEM;
-               goto err_ret;
+               return -ENOMEM;
        }
        adc_dev = iio_priv(indio_dev);
 
@@ -227,7 +227,7 @@ static int tiadc_probe(struct platform_device *pdev)
 
        err = tiadc_channel_init(indio_dev, adc_dev->channels);
        if (err < 0)
-               goto err_free_device;
+               return err;
 
        err = iio_device_register(indio_dev);
        if (err)
@@ -239,9 +239,6 @@ static int tiadc_probe(struct platform_device *pdev)
 
 err_free_channels:
        tiadc_channels_remove(indio_dev);
-err_free_device:
-       iio_device_free(indio_dev);
-err_ret:
        return err;
 }
 
@@ -257,8 +254,6 @@ static int tiadc_remove(struct platform_device *pdev)
        step_en = get_adc_step_mask(adc_dev);
        am335x_tsc_se_clr(adc_dev->mfd_tscadc, step_en);
 
-       iio_device_free(indio_dev);
-
        return 0;
 }