Commit 66e670aa authored by Sachin Kamat's avatar Sachin Kamat Committed by Jonathan Cameron

iio: dac: ad7303: 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 0d7c04d3
...@@ -203,7 +203,7 @@ static int ad7303_probe(struct spi_device *spi) ...@@ -203,7 +203,7 @@ static int ad7303_probe(struct spi_device *spi)
bool ext_ref; bool ext_ref;
int ret; int 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)
return -ENOMEM; return -ENOMEM;
...@@ -212,15 +212,13 @@ static int ad7303_probe(struct spi_device *spi) ...@@ -212,15 +212,13 @@ static int ad7303_probe(struct spi_device *spi)
st->spi = spi; st->spi = spi;
st->vdd_reg = regulator_get(&spi->dev, "Vdd"); st->vdd_reg = devm_regulator_get(&spi->dev, "Vdd");
if (IS_ERR(st->vdd_reg)) { if (IS_ERR(st->vdd_reg))
ret = PTR_ERR(st->vdd_reg); return PTR_ERR(st->vdd_reg);
goto err_free;
}
ret = regulator_enable(st->vdd_reg); ret = regulator_enable(st->vdd_reg);
if (ret) if (ret)
goto err_put_vdd_reg; return ret;
if (spi->dev.of_node) { if (spi->dev.of_node) {
ext_ref = of_property_read_bool(spi->dev.of_node, ext_ref = of_property_read_bool(spi->dev.of_node,
...@@ -234,7 +232,7 @@ static int ad7303_probe(struct spi_device *spi) ...@@ -234,7 +232,7 @@ static int ad7303_probe(struct spi_device *spi)
} }
if (ext_ref) { if (ext_ref) {
st->vref_reg = regulator_get(&spi->dev, "REF"); st->vref_reg = devm_regulator_get(&spi->dev, "REF");
if (IS_ERR(st->vref_reg)) { if (IS_ERR(st->vref_reg)) {
ret = PTR_ERR(st->vref_reg); ret = PTR_ERR(st->vref_reg);
goto err_disable_vdd_reg; goto err_disable_vdd_reg;
...@@ -242,7 +240,7 @@ static int ad7303_probe(struct spi_device *spi) ...@@ -242,7 +240,7 @@ static int ad7303_probe(struct spi_device *spi)
ret = regulator_enable(st->vref_reg); ret = regulator_enable(st->vref_reg);
if (ret) if (ret)
goto err_put_vref_reg; goto err_disable_vdd_reg;
st->config |= AD7303_CFG_EXTERNAL_VREF; st->config |= AD7303_CFG_EXTERNAL_VREF;
} }
...@@ -263,16 +261,8 @@ static int ad7303_probe(struct spi_device *spi) ...@@ -263,16 +261,8 @@ static int ad7303_probe(struct spi_device *spi)
err_disable_vref_reg: err_disable_vref_reg:
if (st->vref_reg) if (st->vref_reg)
regulator_disable(st->vref_reg); regulator_disable(st->vref_reg);
err_put_vref_reg:
if (st->vref_reg)
regulator_put(st->vref_reg);
err_disable_vdd_reg: err_disable_vdd_reg:
regulator_disable(st->vdd_reg); regulator_disable(st->vdd_reg);
err_put_vdd_reg:
regulator_put(st->vdd_reg);
err_free:
iio_device_free(indio_dev);
return ret; return ret;
} }
...@@ -283,14 +273,9 @@ static int ad7303_remove(struct spi_device *spi) ...@@ -283,14 +273,9 @@ static int ad7303_remove(struct spi_device *spi)
iio_device_unregister(indio_dev); iio_device_unregister(indio_dev);
if (st->vref_reg) { if (st->vref_reg)
regulator_disable(st->vref_reg); regulator_disable(st->vref_reg);
regulator_put(st->vref_reg);
}
regulator_disable(st->vdd_reg); regulator_disable(st->vdd_reg);
regulator_put(st->vdd_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