hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

iio: adc: ad7298: Use devm_* APIs 

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 ded4fef934
commit 7abe9007ca
1 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/iio/adc/ad7298.c
View File

@ -296,9 +296,10 @@ static int ad7298_probe(struct spi_device *spi)
{ {
struct ad7298_platform_data *pdata = spi->dev.platform_data; struct ad7298_platform_data *pdata = spi->dev.platform_data;
struct ad7298_state *st; struct ad7298_state *st;
struct iio_dev *indio_dev = iio_device_alloc(sizeof(*st)); struct iio_dev *indio_dev;
int ret; int ret;
indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*st));
if (indio_dev == NULL) if (indio_dev == NULL)
return -ENOMEM; return -ENOMEM;
@ -308,14 +309,13 @@ static int ad7298_probe(struct spi_device *spi)
st->ext_ref = AD7298_EXTREF; st->ext_ref = AD7298_EXTREF;
if (st->ext_ref) { if (st->ext_ref) {
st->reg = regulator_get(&spi->dev, "vref"); st->reg = devm_regulator_get(&spi->dev, "vref");
if (IS_ERR(st->reg)) { if (IS_ERR(st->reg))
ret = PTR_ERR(st->reg); return PTR_ERR(st->reg);
goto error_free;
}
ret = regulator_enable(st->reg); ret = regulator_enable(st->reg);
if (ret) if (ret)
goto error_put_reg; return ret;
} }
spi_set_drvdata(spi, indio_dev); spi_set_drvdata(spi, indio_dev);
@ -361,11 +361,6 @@ error_cleanup_ring:
error_disable_reg: error_disable_reg:
if (st->ext_ref) if (st->ext_ref)
regulator_disable(st->reg); regulator_disable(st->reg);
error_put_reg:
if (st->ext_ref)
regulator_put(st->reg);
error_free:
iio_device_free(indio_dev);
return ret; return ret;
} }
@ -377,11 +372,8 @@ static int ad7298_remove(struct spi_device *spi)
iio_device_unregister(indio_dev); iio_device_unregister(indio_dev);
iio_triggered_buffer_cleanup(indio_dev); iio_triggered_buffer_cleanup(indio_dev);
if (st->ext_ref) { if (st->ext_ref)
regulator_disable(st->reg); regulator_disable(st->reg);
regulator_put(st->reg);
}
iio_device_free(indio_dev);
return 0; return 0;
} }