Received-SPF: pass (google.com: domain of linux-kernel+bounces-57767-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99;
From: Arturas Moskvinas <arturas.moskvinas@gmail.com>
To: Jonathan.Cameron@huawei.com,
	oskar.andero@gmail.com,
	lars@metafoo.de,
	lukas@wunner.de
Cc: linux-iio@vger.kernel.org,
	linux-kernel@vger.kernel.org,
	Arturas Moskvinas <arturas.moskvinas@gmail.com>
Subject: [PATCH] iio: adc: mcp320x: Simplify device removal logic
Date: Thu,  8 Feb 2024 11:43:39 +0200
Message-ID: <20240208094339.82633-1-arturas.moskvinas@gmail.com>
Precedence: bulk
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit

Use devm_* APIs to enable regulator and to register in IIO infrastructure.

Signed-off-by: Arturas Moskvinas <arturas.moskvinas@gmail.com>
---
 drivers/iio/adc/mcp320x.c | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

diff --git a/drivers/iio/adc/mcp320x.c b/drivers/iio/adc/mcp320x.c
index f3b81798b3c9..4685eed35271 100644
--- a/drivers/iio/adc/mcp320x.c
+++ b/drivers/iio/adc/mcp320x.c
@@ -388,7 +388,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];
@@ -441,31 +440,17 @@ static int mcp320x_probe(struct spi_device *spi)
 	if (IS_ERR(adc->reg))
 		return PTR_ERR(adc->reg);
 
-	ret = regulator_enable(adc->reg);
+	ret = devm_regulator_get_enable(&spi->dev, "vref");
 	if (ret < 0)
 		return ret;
 
 	mutex_init(&adc->lock);
 
-	ret = iio_device_register(indio_dev);
-	if (ret < 0)
-		goto reg_disable;
-
-	return 0;
-
-reg_disable:
-	regulator_disable(adc->reg);
-
-	return ret;
+	return devm_iio_device_register(&spi->dev, indio_dev);
 }
 
 static void mcp320x_remove(struct spi_device *spi)
 {
-	struct iio_dev *indio_dev = spi_get_drvdata(spi);
-	struct mcp320x *adc = iio_priv(indio_dev);
-
-	iio_device_unregister(indio_dev);
-	regulator_disable(adc->reg);
 }
 
 static const struct of_device_id mcp320x_dt_ids[] = {

base-commit: 047371968ffc470769f541d6933e262dc7085456
-- 
2.43.0