Skip to contentSkip to conversation

staging: iio: ad9834: Use devm_regulator_get_enable()

PATCH Superseded Saalim Quadri 2 participants 2 messages Mar 3, 2025 – Mar 4, 2025

Subsystems (4)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 staging: iio: ad9834: Use devm_regulator_get_enable()

Use devm_regulator_get_enable() to simplify code.

---
 drivers/staging/iio/frequency/ad9834.c | 22 ++--------------------
 1 file changed, 2 insertions(+), 20 deletions(-)
drivers/staging/iio/frequency/ad9834.c +2 -20
index 6e99e008c5f4..5da2084c46c9 100644
@@ -387,33 +387,15 @@ static const struct iio_info ad9833_info = {
 	.attrs = &ad9833_attribute_group,
 };
 
-static void ad9834_disable_reg(void *data)
-{
-	struct regulator *reg = data;
-
-	regulator_disable(reg);
-}
-
 static int ad9834_probe(struct spi_device *spi)
 {
 	struct ad9834_state *st;
 	struct iio_dev *indio_dev;
-	struct regulator *reg;
 	int ret;
 
-	reg = devm_regulator_get(&spi->dev, "avdd");
-	if (IS_ERR(reg))
-		return PTR_ERR(reg);
-
-	ret = regulator_enable(reg);
-	if (ret) {
-		dev_err(&spi->dev, "Failed to enable specified AVDD supply\n");
-		return ret;
-	}
-
-	ret = devm_add_action_or_reset(&spi->dev, ad9834_disable_reg, reg);
+	ret = devm_regulator_get_enable(&spi->dev, "avdd");
 	if (ret)
-		return ret;
+		return dev_err_probe(&spi->dev, ret, "Failed to get AVDD voltage\n");
 
 	indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*st));
 	if (!indio_dev) {
Signature · 1 line
2.34.1
maintainer
#1 lore raw
Quoted 34 lines · On Tue, 4 Mar 2025 03:52:00 +0530 Saalim Quadri <[email protected]> wrote:

Use devm_regulator_get_enable() to simplify code.

---
 drivers/staging/iio/frequency/ad9834.c | 22 ++--------------------
 1 file changed, 2 insertions(+), 20 deletions(-)
drivers/staging/iio/frequency/ad9834.c +0 -13
index 6e99e008c5f4..5da2084c46c9 100644
@@ -387,33 +387,15 @@ static const struct iio_info ad9833_info = {
 	.attrs = &ad9833_attribute_group,
 };
 
-static void ad9834_disable_reg(void *data)
-{
-	struct regulator *reg = data;
-
-	regulator_disable(reg);
-}
-
 static int ad9834_probe(struct spi_device *spi)
 {
 	struct ad9834_state *st;
 	struct iio_dev *indio_dev;
-	struct regulator *reg;
 	int ret;
 
-	reg = devm_regulator_get(&spi->dev, "avdd");
-	if (IS_ERR(reg))
-		return PTR_ERR(reg);
-
-	ret = regulator_enable(reg);

drivers/staging/iio/frequency/ad9834.c static const struct iio_info ad9833_info = { · line 398

Quoted 10 lines
drivers/staging/iio/frequency/ad9834.c +2 -7
-	if (ret) {
-		dev_err(&spi->dev, "Failed to enable specified AVDD supply\n");
-		return ret;
-	}
-
-	ret = devm_add_action_or_reset(&spi->dev, ad9834_disable_reg, reg);
+	ret = devm_regulator_get_enable(&spi->dev, "avdd");
 	if (ret)
-		return ret;
+		return dev_err_probe(&spi->dev, ret, "Failed to get AVDD voltage\n");

Hi,

You aren't getting the voltage, just turning the regulator on so this error message is misleading.

Quoted 3 lines
drivers/staging/iio/frequency/ad9834.c +0 -0
 	indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*st));
 	if (!indio_dev) {