[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20240219074139.193464-2-arturas.moskvinas@gmail.com>
Date: Mon, 19 Feb 2024 09:41:40 +0200
From: Arturas Moskvinas <arturas.moskvinas@...il.com>
To: jic23@...nel.org,
Jonathan.Cameron@...wei.com,
oskar.andero@...il.com,
lars@...afoo.de,
lukas@...ner.de
Cc: linux-iio@...r.kernel.org,
linux-kernel@...r.kernel.org,
Arturas Moskvinas <arturas.moskvinas@...il.com>
Subject: [PATCH v2] iio: adc: mcp320x: Simplify device removal logic
Use devm_* APIs to enable/disable regulator and to register in IIO infrastructure.
Signed-off-by: Arturas Moskvinas <arturas.moskvinas@...il.com>
---
v1 -> v2:
- Use devm_add_action_or_reset instead of devm_regulator_get_enable to automate disabling regulator
- Remove empty mcp320x_remove function
---
drivers/iio/adc/mcp320x.c | 29 +++++++++--------------------
1 file changed, 9 insertions(+), 20 deletions(-)
diff --git a/drivers/iio/adc/mcp320x.c b/drivers/iio/adc/mcp320x.c
index f3b81798b3c9..da1421bd7b62 100644
--- a/drivers/iio/adc/mcp320x.c
+++ b/drivers/iio/adc/mcp320x.c
@@ -371,6 +371,11 @@ static const struct mcp320x_chip_info mcp320x_chip_infos[] = {
},
};
+static void mcp320x_regulator_disable(void *reg)
+{
+ regulator_disable(reg);
+}
+
static int mcp320x_probe(struct spi_device *spi)
{
struct iio_dev *indio_dev;
@@ -388,7 +393,6 @@ static int mcp320x_probe(struct spi_device *spi)
indio_dev->name = spi_get_device_id(spi)->name;
indio_dev->modes = INDIO_DIRECT_MODE;
indio_dev->info = &mcp320x_info;
- spi_set_drvdata(spi, indio_dev);
device_index = spi_get_device_id(spi)->driver_data;
chip_info = &mcp320x_chip_infos[device_index];
@@ -445,27 +449,13 @@ static int mcp320x_probe(struct spi_device *spi)
if (ret < 0)
return ret;
- mutex_init(&adc->lock);
-
- ret = iio_device_register(indio_dev);
+ ret = devm_add_action_or_reset(&spi->dev, mcp320x_regulator_disable, adc->reg);
if (ret < 0)
- goto reg_disable;
-
- return 0;
-
-reg_disable:
- regulator_disable(adc->reg);
-
- return ret;
-}
+ return ret;
-static void mcp320x_remove(struct spi_device *spi)
-{
- struct iio_dev *indio_dev = spi_get_drvdata(spi);
- struct mcp320x *adc = iio_priv(indio_dev);
+ mutex_init(&adc->lock);
- iio_device_unregister(indio_dev);
- regulator_disable(adc->reg);
+ return devm_iio_device_register(&spi->dev, indio_dev);
}
static const struct of_device_id mcp320x_dt_ids[] = {
@@ -520,7 +510,6 @@ static struct spi_driver mcp320x_driver = {
.of_match_table = mcp320x_dt_ids,
},
.probe = mcp320x_probe,
- .remove = mcp320x_remove,
.id_table = mcp320x_id,
};
module_spi_driver(mcp320x_driver);
base-commit: 8d3dea210042f54b952b481838c1e7dfc4ec751d
--
2.43.2
Powered by blists - more mailing lists