iio: adc: ad7298: Use devm_* APIs

devm_* APIs are device managed and make code simpler.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Acked-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>

1 files changed, 8 insertions, 16 deletions

diff --git a/drivers/iio/adc/ad7298.c b/drivers/iio/adc/ad7298.c
index 03b77189dbfe..85d1481c312f 100644
--- a/drivers/iio/adc/ad7298.c
+++ b/drivers/iio/adc/ad7298.c
@@ -296,9 +296,10 @@ static int ad7298_probe(struct spi_device *spi)
 {
         struct ad7298_platform_data *pdata = spi->dev.platform_data;
         struct ad7298_state *st;
-        struct iio_dev *indio_dev = iio_device_alloc(sizeof(*st));
+        struct iio_dev *indio_dev;
         int ret;
 
+        indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*st));
         if (indio_dev == NULL)
                 return -ENOMEM;
 
@@ -308,14 +309,13 @@ static int ad7298_probe(struct spi_device *spi)
                 st->ext_ref = AD7298_EXTREF;
 
         if (st->ext_ref) {
-                st->reg = regulator_get(&spi->dev, "vref");
-                if (IS_ERR(st->reg)) {
-                        ret = PTR_ERR(st->reg);
-                        goto error_free;
-                }
+                st->reg = devm_regulator_get(&spi->dev, "vref");
+                if (IS_ERR(st->reg))
+                        return PTR_ERR(st->reg);
+
                 ret = regulator_enable(st->reg);
                 if (ret)
-                        goto error_put_reg;
+                        return ret;
         }
 
         spi_set_drvdata(spi, indio_dev);
@@ -361,11 +361,6 @@ error_cleanup_ring:
 error_disable_reg:
         if (st->ext_ref)
                 regulator_disable(st->reg);
-error_put_reg:
-        if (st->ext_ref)
-                regulator_put(st->reg);
-error_free:
-        iio_device_free(indio_dev);
 
         return ret;
 }
@@ -377,11 +372,8 @@ static int ad7298_remove(struct spi_device *spi)
 
         iio_device_unregister(indio_dev);
         iio_triggered_buffer_cleanup(indio_dev);
-        if (st->ext_ref) {
+        if (st->ext_ref)
                 regulator_disable(st->reg);
-                regulator_put(st->reg);
-        }
-        iio_device_free(indio_dev);
 
         return 0;
 }