Commit 16cc9aa4 authored by Christophe JAILLET's avatar Christophe JAILLET Committed by Jonathan Cameron

iio: adc: adc128s052: Simplify adc128_probe()

Turn 'adc128_probe()' into a full resource managed function to simplify the
code.

This way, the .remove function can be removed.
Doing so, the only 'spi_get_drvdata()' call is removed and the
corresponding 'spi_set_drvdata()' can be removed as well.
Suggested-by: default avatarAlexandru Ardelean <ardeleanalex@gmail.com>
Signed-off-by: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Reviewed-by: default avatarAlexandru Ardelean <ardeleanalex@gmail.com>
Link: https://lore.kernel.org/r/4fa7fcc59c40e27af0569138d656c698a53dbd44.1630002770.git.christophe.jaillet@wanadoo.frSigned-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
parent 39aa5040
...@@ -132,6 +132,11 @@ static const struct iio_info adc128_info = { ...@@ -132,6 +132,11 @@ static const struct iio_info adc128_info = {
.read_raw = adc128_read_raw, .read_raw = adc128_read_raw,
}; };
static void adc128_disable_regulator(void *reg)
{
regulator_disable(reg);
}
static int adc128_probe(struct spi_device *spi) static int adc128_probe(struct spi_device *spi)
{ {
struct iio_dev *indio_dev; struct iio_dev *indio_dev;
...@@ -151,8 +156,6 @@ static int adc128_probe(struct spi_device *spi) ...@@ -151,8 +156,6 @@ static int adc128_probe(struct spi_device *spi)
adc = iio_priv(indio_dev); adc = iio_priv(indio_dev);
adc->spi = spi; adc->spi = spi;
spi_set_drvdata(spi, indio_dev);
indio_dev->name = spi_get_device_id(spi)->name; indio_dev->name = spi_get_device_id(spi)->name;
indio_dev->modes = INDIO_DIRECT_MODE; indio_dev->modes = INDIO_DIRECT_MODE;
indio_dev->info = &adc128_info; indio_dev->info = &adc128_info;
...@@ -167,29 +170,14 @@ static int adc128_probe(struct spi_device *spi) ...@@ -167,29 +170,14 @@ static int adc128_probe(struct spi_device *spi)
ret = regulator_enable(adc->reg); ret = regulator_enable(adc->reg);
if (ret < 0) if (ret < 0)
return ret; return ret;
ret = devm_add_action_or_reset(&spi->dev, adc128_disable_regulator,
mutex_init(&adc->lock); adc->reg);
ret = iio_device_register(indio_dev);
if (ret) if (ret)
goto err_disable_regulator; return ret;
return 0;
err_disable_regulator:
regulator_disable(adc->reg);
return ret;
}
static int adc128_remove(struct spi_device *spi)
{
struct iio_dev *indio_dev = spi_get_drvdata(spi);
struct adc128 *adc = iio_priv(indio_dev);
iio_device_unregister(indio_dev); mutex_init(&adc->lock);
regulator_disable(adc->reg);
return 0; return devm_iio_device_register(&spi->dev, indio_dev);
} }
static const struct of_device_id adc128_of_match[] = { static const struct of_device_id adc128_of_match[] = {
...@@ -231,7 +219,6 @@ static struct spi_driver adc128_driver = { ...@@ -231,7 +219,6 @@ static struct spi_driver adc128_driver = {
.acpi_match_table = ACPI_PTR(adc128_acpi_match), .acpi_match_table = ACPI_PTR(adc128_acpi_match),
}, },
.probe = adc128_probe, .probe = adc128_probe,
.remove = adc128_remove,
.id_table = adc128_id, .id_table = adc128_id,
}; };
module_spi_driver(adc128_driver); module_spi_driver(adc128_driver);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment