Commit e3a27cc4 authored by Sachin Kamat's avatar Sachin Kamat Committed by Jonathan Cameron

staging: iio: ad9834: Use devm_* APIs

devm_* APIs are device managed and make code simpler.
Signed-off-by: default avatarSachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
parent 24873295
...@@ -327,14 +327,14 @@ static int ad9834_probe(struct spi_device *spi) ...@@ -327,14 +327,14 @@ static int ad9834_probe(struct spi_device *spi)
return -ENODEV; return -ENODEV;
} }
reg = regulator_get(&spi->dev, "vcc"); reg = devm_regulator_get(&spi->dev, "vcc");
if (!IS_ERR(reg)) { if (!IS_ERR(reg)) {
ret = regulator_enable(reg); ret = regulator_enable(reg);
if (ret) if (ret)
goto error_put_reg; return ret;
} }
indio_dev = iio_device_alloc(sizeof(*st)); indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*st));
if (indio_dev == NULL) { if (indio_dev == NULL) {
ret = -ENOMEM; ret = -ENOMEM;
goto error_disable_reg; goto error_disable_reg;
...@@ -388,39 +388,35 @@ static int ad9834_probe(struct spi_device *spi) ...@@ -388,39 +388,35 @@ static int ad9834_probe(struct spi_device *spi)
ret = spi_sync(st->spi, &st->msg); ret = spi_sync(st->spi, &st->msg);
if (ret) { if (ret) {
dev_err(&spi->dev, "device init failed\n"); dev_err(&spi->dev, "device init failed\n");
goto error_free_device; goto error_disable_reg;
} }
ret = ad9834_write_frequency(st, AD9834_REG_FREQ0, pdata->freq0); ret = ad9834_write_frequency(st, AD9834_REG_FREQ0, pdata->freq0);
if (ret) if (ret)
goto error_free_device; goto error_disable_reg;
ret = ad9834_write_frequency(st, AD9834_REG_FREQ1, pdata->freq1); ret = ad9834_write_frequency(st, AD9834_REG_FREQ1, pdata->freq1);
if (ret) if (ret)
goto error_free_device; goto error_disable_reg;
ret = ad9834_write_phase(st, AD9834_REG_PHASE0, pdata->phase0); ret = ad9834_write_phase(st, AD9834_REG_PHASE0, pdata->phase0);
if (ret) if (ret)
goto error_free_device; goto error_disable_reg;
ret = ad9834_write_phase(st, AD9834_REG_PHASE1, pdata->phase1); ret = ad9834_write_phase(st, AD9834_REG_PHASE1, pdata->phase1);
if (ret) if (ret)
goto error_free_device; goto error_disable_reg;
ret = iio_device_register(indio_dev); ret = iio_device_register(indio_dev);
if (ret) if (ret)
goto error_free_device; goto error_disable_reg;
return 0; return 0;
error_free_device:
iio_device_free(indio_dev);
error_disable_reg: error_disable_reg:
if (!IS_ERR(reg)) if (!IS_ERR(reg))
regulator_disable(reg); regulator_disable(reg);
error_put_reg:
if (!IS_ERR(reg))
regulator_put(reg);
return ret; return ret;
} }
...@@ -430,11 +426,8 @@ static int ad9834_remove(struct spi_device *spi) ...@@ -430,11 +426,8 @@ static int ad9834_remove(struct spi_device *spi)
struct ad9834_state *st = iio_priv(indio_dev); struct ad9834_state *st = iio_priv(indio_dev);
iio_device_unregister(indio_dev); iio_device_unregister(indio_dev);
if (!IS_ERR(st->reg)) { if (!IS_ERR(st->reg))
regulator_disable(st->reg); regulator_disable(st->reg);
regulator_put(st->reg);
}
iio_device_free(indio_dev);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment