iio: frequency: ad9523: Use devm_* APIs
authorSachin Kamat <sachin.kamat@linaro.org>
Tue, 30 Jul 2013 06:24:00 +0000 (07:24 +0100)
committerJonathan Cameron <jic23@kernel.org>
Sat, 3 Aug 2013 20:01:27 +0000 (21:01 +0100)
devm_* APIs are device managed and make code simpler.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Cc: Michael Hennerich <hennerich@blackfin.uclinux.org>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
drivers/iio/frequency/ad9523.c

index 92276deeb026d0fc0741b5ca505626cc2fbd6afa..7c5245d9f99ccc82abee8d7eb9fdb5e14e0b3102 100644 (file)
@@ -961,17 +961,17 @@ static int ad9523_probe(struct spi_device *spi)
                return -EINVAL;
        }
 
-       indio_dev = iio_device_alloc(sizeof(*st));
+       indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*st));
        if (indio_dev == NULL)
                return -ENOMEM;
 
        st = iio_priv(indio_dev);
 
-       st->reg = regulator_get(&spi->dev, "vcc");
+       st->reg = devm_regulator_get(&spi->dev, "vcc");
        if (!IS_ERR(st->reg)) {
                ret = regulator_enable(st->reg);
                if (ret)
-                       goto error_put_reg;
+                       return ret;
        }
 
        spi_set_drvdata(spi, indio_dev);
@@ -1001,11 +1001,6 @@ static int ad9523_probe(struct spi_device *spi)
 error_disable_reg:
        if (!IS_ERR(st->reg))
                regulator_disable(st->reg);
-error_put_reg:
-       if (!IS_ERR(st->reg))
-               regulator_put(st->reg);
-
-       iio_device_free(indio_dev);
 
        return ret;
 }
@@ -1017,12 +1012,8 @@ static int ad9523_remove(struct spi_device *spi)
 
        iio_device_unregister(indio_dev);
 
-       if (!IS_ERR(st->reg)) {
+       if (!IS_ERR(st->reg))
                regulator_disable(st->reg);
-               regulator_put(st->reg);
-       }
-
-       iio_device_free(indio_dev);
 
        return 0;
 }