On 07/30/13 07:24, Sachin Kamat wrote:
> devm_* APIs are device managed and make code simpler.
>
> Signed-off-by: Sachin Kamat <sachin.kamat@xxxxxxxxxx>
> Cc: Michael Hennerich <hennerich@xxxxxxxxxxxxxxxxxxxx>
Applied to the togreg branch of iio.git
Thanks,
> ---
> drivers/iio/frequency/ad9523.c | 17 ++++-------------
> 1 file changed, 4 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/iio/frequency/ad9523.c b/drivers/iio/frequency/ad9523.c
> index 92276de..7c5245d 100644
> --- a/drivers/iio/frequency/ad9523.c
> +++ b/drivers/iio/frequency/ad9523.c
> @@ -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;
> }
>
--
To unsubscribe from this list: send the line "unsubscribe linux-iio" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
