iio: dac: ad5624r_spi: 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>
This commit is contained in:
parent
8571ebf7fc
commit
75238230cc
|
@ -226,17 +226,15 @@ static int ad5624r_probe(struct spi_device *spi)
|
||||||
struct iio_dev *indio_dev;
|
struct iio_dev *indio_dev;
|
||||||
int ret, voltage_uv = 0;
|
int ret, voltage_uv = 0;
|
||||||
|
|
||||||
indio_dev = iio_device_alloc(sizeof(*st));
|
indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*st));
|
||||||
if (indio_dev == NULL) {
|
if (!indio_dev)
|
||||||
ret = -ENOMEM;
|
return -ENOMEM;
|
||||||
goto error_ret;
|
|
||||||
}
|
|
||||||
st = iio_priv(indio_dev);
|
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)) {
|
if (!IS_ERR(st->reg)) {
|
||||||
ret = regulator_enable(st->reg);
|
ret = regulator_enable(st->reg);
|
||||||
if (ret)
|
if (ret)
|
||||||
goto error_put_reg;
|
return ret;
|
||||||
|
|
||||||
ret = regulator_get_voltage(st->reg);
|
ret = regulator_get_voltage(st->reg);
|
||||||
if (ret < 0)
|
if (ret < 0)
|
||||||
|
@ -277,11 +275,6 @@ static int ad5624r_probe(struct spi_device *spi)
|
||||||
error_disable_reg:
|
error_disable_reg:
|
||||||
if (!IS_ERR(st->reg))
|
if (!IS_ERR(st->reg))
|
||||||
regulator_disable(st->reg);
|
regulator_disable(st->reg);
|
||||||
error_put_reg:
|
|
||||||
if (!IS_ERR(st->reg))
|
|
||||||
regulator_put(st->reg);
|
|
||||||
iio_device_free(indio_dev);
|
|
||||||
error_ret:
|
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
@ -292,11 +285,8 @@ static int ad5624r_remove(struct spi_device *spi)
|
||||||
struct ad5624r_state *st = iio_priv(indio_dev);
|
struct ad5624r_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;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue