提交 a3580132 编写于 作者: S Sachin Kamat 提交者: Jonathan Cameron

iio: adc: ad7793: Use devm_* APIs

devm_* APIs are device managed and make code simpler.
Signed-off-by: NSachin Kamat <sachin.kamat@linaro.org>
Acked-by: NLars-Peter Clausen <lars@metafoo.de>
Signed-off-by: NJonathan Cameron <jic23@kernel.org>
上级 eb8fe607
...@@ -757,7 +757,7 @@ static int ad7793_probe(struct spi_device *spi) ...@@ -757,7 +757,7 @@ static int ad7793_probe(struct spi_device *spi)
return -ENODEV; return -ENODEV;
} }
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;
...@@ -766,15 +766,13 @@ static int ad7793_probe(struct spi_device *spi) ...@@ -766,15 +766,13 @@ static int ad7793_probe(struct spi_device *spi)
ad_sd_init(&st->sd, indio_dev, spi, &ad7793_sigma_delta_info); ad_sd_init(&st->sd, indio_dev, spi, &ad7793_sigma_delta_info);
if (pdata->refsel != AD7793_REFSEL_INTERNAL) { if (pdata->refsel != AD7793_REFSEL_INTERNAL) {
st->reg = regulator_get(&spi->dev, "refin"); st->reg = devm_regulator_get(&spi->dev, "refin");
if (IS_ERR(st->reg)) { if (IS_ERR(st->reg))
ret = PTR_ERR(st->reg); return PTR_ERR(st->reg);
goto error_device_free;
}
ret = regulator_enable(st->reg); ret = regulator_enable(st->reg);
if (ret) if (ret)
goto error_put_reg; return ret;
vref_mv = regulator_get_voltage(st->reg); vref_mv = regulator_get_voltage(st->reg);
if (vref_mv < 0) { if (vref_mv < 0) {
...@@ -818,11 +816,6 @@ static int ad7793_probe(struct spi_device *spi) ...@@ -818,11 +816,6 @@ static int ad7793_probe(struct spi_device *spi)
error_disable_reg: error_disable_reg:
if (pdata->refsel != AD7793_REFSEL_INTERNAL) if (pdata->refsel != AD7793_REFSEL_INTERNAL)
regulator_disable(st->reg); regulator_disable(st->reg);
error_put_reg:
if (pdata->refsel != AD7793_REFSEL_INTERNAL)
regulator_put(st->reg);
error_device_free:
iio_device_free(indio_dev);
return ret; return ret;
} }
...@@ -836,12 +829,8 @@ static int ad7793_remove(struct spi_device *spi) ...@@ -836,12 +829,8 @@ static int ad7793_remove(struct spi_device *spi)
iio_device_unregister(indio_dev); iio_device_unregister(indio_dev);
ad_sd_cleanup_buffer_and_trigger(indio_dev); ad_sd_cleanup_buffer_and_trigger(indio_dev);
if (pdata->refsel != AD7793_REFSEL_INTERNAL) { if (pdata->refsel != AD7793_REFSEL_INTERNAL)
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% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册