public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-05-24 10:39:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

iio: adc: ad7793: Use devm_* APIs

Browse source 
devm_* APIs are device managed and make code simpler.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Acked-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
This commit is contained in:
Sachin Kamat 2013-07-23 09:58:00 +01:00 • committed by Jonathan Cameron
parent eb8fe60784
commit a35801326b
1 changed files with 6 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
drivers/iio/adc/ad7793.c
View file

@ -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)
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 @@ error_remove_trigger:
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)
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;
} }