iio: dac: ad5360: Use devm_* APIs

devm_* APIs are device managed and make code simpler.

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

diff --git a/drivers/iio/dac/ad5360.c b/drivers/iio/dac/ad5360.c
index 80923af424f2776a76343cd96b892a0132eeab36..d2da71ece740cbc1b0d62710d0afdbbba725ed91 100644 (file)
--- a/drivers/iio/dac/ad5360.c
+++ b/drivers/iio/dac/ad5360.c
@@ -459,7 +459,7 @@ static int ad5360_probe(struct spi_device *spi)
        unsigned int i;
        int ret;
 
-       indio_dev = iio_device_alloc(sizeof(*st));
+       indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*st));
        if (indio_dev == NULL) {
                dev_err(&spi->dev, "Failed to allocate iio device\n");
                return  -ENOMEM;
@@ -480,13 +480,13 @@ static int ad5360_probe(struct spi_device *spi)
        ret = ad5360_alloc_channels(indio_dev);
        if (ret) {
                dev_err(&spi->dev, "Failed to allocate channel spec: %d\n", ret);
-               goto error_free;
+               return ret;
        }
 
        for (i = 0; i < st->chip_info->num_vrefs; ++i)
                st->vref_reg[i].supply = ad5360_vref_name[i];
 
-       ret = regulator_bulk_get(&st->spi->dev, st->chip_info->num_vrefs,
+       ret = devm_regulator_bulk_get(&st->spi->dev, st->chip_info->num_vrefs,
                st->vref_reg);
        if (ret) {
                dev_err(&spi->dev, "Failed to request vref regulators: %d\n", ret);
@@ -496,7 +496,7 @@ static int ad5360_probe(struct spi_device *spi)
        ret = regulator_bulk_enable(st->chip_info->num_vrefs, st->vref_reg);
        if (ret) {
                dev_err(&spi->dev, "Failed to enable vref regulators: %d\n", ret);
-               goto error_free_reg;
+               goto error_free_channels;
        }
 
        ret = iio_device_register(indio_dev);
@@ -509,12 +509,8 @@ static int ad5360_probe(struct spi_device *spi)
 
 error_disable_reg:
        regulator_bulk_disable(st->chip_info->num_vrefs, st->vref_reg);
-error_free_reg:
-       regulator_bulk_free(st->chip_info->num_vrefs, st->vref_reg);
 error_free_channels:
        kfree(indio_dev->channels);
-error_free:
-       iio_device_free(indio_dev);
 
        return ret;
 }
@@ -529,9 +525,6 @@ static int ad5360_remove(struct spi_device *spi)
        kfree(indio_dev->channels);
 
        regulator_bulk_disable(st->chip_info->num_vrefs, st->vref_reg);
-       regulator_bulk_free(st->chip_info->num_vrefs, st->vref_reg);
-
-       iio_device_free(indio_dev);
 
        return 0;
 }