mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-22 00:40:03 +00:00
iio: adc: ad7476: implement devm_add_action_or_reset
Use devm_add_action_or_reset to automatically disable the device when it is removed or an error occurs during probe routine. Signed-off-by: Beniamin Bia <beniamin.bia@analog.com> Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
This commit is contained in:
parent
0267a31666
commit
4bb2b8f94a
1 changed files with 12 additions and 13 deletions
|
@ -256,6 +256,13 @@ static const struct iio_info ad7476_info = {
|
|||
.read_raw = &ad7476_read_raw,
|
||||
};
|
||||
|
||||
static void ad7476_reg_disable(void *data)
|
||||
{
|
||||
struct ad7476_state *st = data;
|
||||
|
||||
regulator_disable(st->reg);
|
||||
}
|
||||
|
||||
static int ad7476_probe(struct spi_device *spi)
|
||||
{
|
||||
struct ad7476_state *st;
|
||||
|
@ -278,6 +285,11 @@ static int ad7476_probe(struct spi_device *spi)
|
|||
if (ret)
|
||||
return ret;
|
||||
|
||||
ret = devm_add_action_or_reset(&spi->dev, ad7476_reg_disable,
|
||||
st);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
st->convst_gpio = devm_gpiod_get_optional(&spi->dev,
|
||||
"adi,conversion-start",
|
||||
GPIOD_OUT_LOW);
|
||||
|
@ -328,18 +340,6 @@ static int ad7476_probe(struct spi_device *spi)
|
|||
return ret;
|
||||
}
|
||||
|
||||
static int ad7476_remove(struct spi_device *spi)
|
||||
{
|
||||
struct iio_dev *indio_dev = spi_get_drvdata(spi);
|
||||
struct ad7476_state *st = iio_priv(indio_dev);
|
||||
|
||||
iio_device_unregister(indio_dev);
|
||||
iio_triggered_buffer_cleanup(indio_dev);
|
||||
regulator_disable(st->reg);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static const struct spi_device_id ad7476_id[] = {
|
||||
{"ad7091", ID_AD7091R},
|
||||
{"ad7091r", ID_AD7091R},
|
||||
|
@ -377,7 +377,6 @@ static struct spi_driver ad7476_driver = {
|
|||
.name = "ad7476",
|
||||
},
|
||||
.probe = ad7476_probe,
|
||||
.remove = ad7476_remove,
|
||||
.id_table = ad7476_id,
|
||||
};
|
||||
module_spi_driver(ad7476_driver);
|
||||
|
|
Loading…
Reference in a new issue