Skip to contentSkip to conversation

iio: adc: bcm_iproc_adc: Use dev_err_probe() for resource acquisition failures

PATCH In review [email protected] 4 participants 6 messages Jul 26 – Aug 6

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 iio: adc: bcm_iproc_adc: Use dev_err_probe() for resource acquisition failures

From: Mohammad Shahid <[email protected]>

Replace open-coded dev_err() and error returns with dev_err_probe() for failures from syscon_regmap_lookup_by_phandle() and devm_clk_get() in the probe path.

This simplifies error handling and properly handles deferred probing.

---
 drivers/iio/adc/bcm_iproc_adc.c | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)
drivers/iio/adc/bcm_iproc_adc.c +8 -11
index cf4738b16e62..62f12eecc8b2 100644
@@ -522,19 +522,16 @@ static int iproc_adc_probe(struct platform_device *pdev)
 
 	adc_priv->regmap = syscon_regmap_lookup_by_phandle(pdev->dev.of_node,
 			   "adc-syscon");
-	if (IS_ERR(adc_priv->regmap)) {
-		dev_err(&pdev->dev, "failed to get handle for tsc syscon\n");
-		ret = PTR_ERR(adc_priv->regmap);
-		return ret;
-	}
+	if (IS_ERR(adc_priv->regmap))
+		return dev_err_probe(&pdev->dev,
+				     PTR_ERR(adc_priv->regmap),
+				     "failed to get handle for tsc syscon\n");
 
 	adc_priv->adc_clk = devm_clk_get(&pdev->dev, "tsc_clk");
-	if (IS_ERR(adc_priv->adc_clk)) {
-		dev_err(&pdev->dev,
-			"failed getting clock tsc_clk\n");
-		ret = PTR_ERR(adc_priv->adc_clk);
-		return ret;
-	}
+	if (IS_ERR(adc_priv->adc_clk))
+		return dev_err_probe(&pdev->dev,
+				     PTR_ERR(adc_priv->adc_clk),
+				     "failed getting clock tsc_clk\n");
 
 	adc_priv->irqno = platform_get_irq(pdev, 0);
 	if (adc_priv->irqno < 0)
Signature · 1 line
2.43.0
maintainer
#1 lore raw
Quoted 32 lines · On Sun, 26 Jul 2026 23:33:19 +0530 [email protected] wrote:

From: Mohammad Shahid <[email protected]>

Replace open-coded dev_err() and error returns with dev_err_probe() for failures from syscon_regmap_lookup_by_phandle() and devm_clk_get() in the probe path.

This simplifies error handling and properly handles deferred probing.

---
 drivers/iio/adc/bcm_iproc_adc.c | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)
drivers/iio/adc/bcm_iproc_adc.c +4 -5
index cf4738b16e62..62f12eecc8b2 100644
@@ -522,19 +522,16 @@ static int iproc_adc_probe(struct platform_device *pdev)
 
 	adc_priv->regmap = syscon_regmap_lookup_by_phandle(pdev->dev.of_node,
 			   "adc-syscon");
-	if (IS_ERR(adc_priv->regmap)) {
-		dev_err(&pdev->dev, "failed to get handle for tsc syscon\n");
-		ret = PTR_ERR(adc_priv->regmap);
-		return ret;
-	}
+	if (IS_ERR(adc_priv->regmap))
+		return dev_err_probe(&pdev->dev,
+				     PTR_ERR(adc_priv->regmap),
+				     "failed to get handle for tsc syscon\n");
 
 	adc_priv->adc_clk = devm_clk_get(&pdev->dev, "tsc_clk");

drivers/iio/adc/bcm_iproc_adc.c static int iproc_adc_probe(struct platform_device *pdev) · line 534

Quoted 10 lines
drivers/iio/adc/bcm_iproc_adc.c +4 -6
-	if (IS_ERR(adc_priv->adc_clk)) {
-		dev_err(&pdev->dev,
-			"failed getting clock tsc_clk\n");
-		ret = PTR_ERR(adc_priv->adc_clk);
-		return ret;
-	}
+	if (IS_ERR(adc_priv->adc_clk))
+		return dev_err_probe(&pdev->dev,
+				     PTR_ERR(adc_priv->adc_clk),
+				     "failed getting clock tsc_clk\n");

Why stop here? There seem to be a number of other prints that follow that would benefit from dev_err_probe() at least in terms of simplifying the code if not due to the handling of potential deferred probes.

Please look at them all but also consider if the print is necessary. Beware there are some mass removal patches dropping some specific prints so you may cross with those.

Jonathan

Quoted 3 lines
drivers/iio/adc/bcm_iproc_adc.c +0 -0
 	adc_priv->irqno = platform_get_irq(pdev, 0);
 	if (adc_priv->irqno < 0)
#2 lore raw

Hi Jonathan,

Thanks for the review.

This v2 updates all applicable probe-time error paths to use dev_err_probe() and removes the redundant error message after iproc_adc_enable(), addressing your feedback.

Thanks,
Mohammad Shahid

#3 lore raw

PATCH v2 1/1 iio: adc: bcm_iproc_adc: Convert probe() to use dev_err_probe()

From: Mohammad Shahid <[email protected]>

Replace open-coded probe error handling with dev_err_probe() for resource acquisition and initialization failures.

This simplifies the error paths, avoids repetitive error handling, and automatically suppresses duplicate messages when -EPROBE_DEFER is returned while preserving the existing error messages.

Also remove the redundant error message after iproc_adc_enable(), allowing the error to be propagated without additional logging.

---
v2:
- Convert remaining probe error paths to use dev_err_probe().
- Remove redundant error message after iproc_adc_enable()

 drivers/iio/adc/bcm_iproc_adc.c | 52 +++++++++++++++------------------
 1 file changed, 24 insertions(+), 28 deletions(-)
drivers/iio/adc/bcm_iproc_adc.c +24 -28
index cf4738b16e62..08e056468d8e 100644
@@ -522,52 +522,48 @@ static int iproc_adc_probe(struct platform_device *pdev)
 
 	adc_priv->regmap = syscon_regmap_lookup_by_phandle(pdev->dev.of_node,
 			   "adc-syscon");
-	if (IS_ERR(adc_priv->regmap)) {
-		dev_err(&pdev->dev, "failed to get handle for tsc syscon\n");
-		ret = PTR_ERR(adc_priv->regmap);
-		return ret;
-	}
+	if (IS_ERR(adc_priv->regmap))
+		return dev_err_probe(&pdev->dev,
+				     PTR_ERR(adc_priv->regmap),
+				     "failed to get handle for tsc syscon\n");
 
 	adc_priv->adc_clk = devm_clk_get(&pdev->dev, "tsc_clk");
-	if (IS_ERR(adc_priv->adc_clk)) {
-		dev_err(&pdev->dev,
-			"failed getting clock tsc_clk\n");
-		ret = PTR_ERR(adc_priv->adc_clk);
-		return ret;
-	}
+	if (IS_ERR(adc_priv->adc_clk))
+		return dev_err_probe(&pdev->dev,
+				     PTR_ERR(adc_priv->adc_clk),
+				     "failed getting clock tsc_clk\n");
 
 	adc_priv->irqno = platform_get_irq(pdev, 0);
 	if (adc_priv->irqno < 0)
-		return adc_priv->irqno;
+		return dev_err_probe(&pdev->dev,
+				     adc_priv->irqno,
+				     "failed to get IRQ\n");
 
 	ret = regmap_clear_bits(adc_priv->regmap, IPROC_REGCTL2,
 				IPROC_ADC_AUXIN_SCAN_ENA);
-	if (ret) {
-		dev_err(&pdev->dev, "failed to write IPROC_REGCTL2 %d\n", ret);
-		return ret;
-	}
+	if (ret)
+		return dev_err_probe(&pdev->dev,
+				     ret,
+				     "failed to write IPROC_REGCTL2\n");
 
 	ret = devm_request_threaded_irq(&pdev->dev, adc_priv->irqno,
 				iproc_adc_interrupt_handler,
 				iproc_adc_interrupt_thread,
 				IRQF_SHARED, "iproc-adc", indio_dev);
-	if (ret) {
-		dev_err(&pdev->dev, "request_irq error %d\n", ret);
-		return ret;
-	}
+	if (ret)
+		return dev_err_probe(&pdev->dev,
+				     ret,
+				     "failed to request IRQ\n");
 
 	ret = clk_prepare_enable(adc_priv->adc_clk);
-	if (ret) {
-		dev_err(&pdev->dev,
-			"clk_prepare_enable failed %d\n", ret);
-		return ret;
-	}
+	if (ret)
+		return dev_err_probe(&pdev->dev,
+				     ret,
+				     "failed to enable clock\n");
 
 	ret = iproc_adc_enable(indio_dev);
-	if (ret) {
-		dev_err(&pdev->dev, "failed to enable adc %d\n", ret);
+	if (ret)
 		goto err_adc_enable;
-	}
 
 	indio_dev->name = "iproc-static-adc";
 	indio_dev->info = &iproc_adc_iio_info;
Signature · 1 line
2.43.0
#4 lore raw

Re: [PATCH v2] iio: adc: bcm_iproc_adc: Convert probe() to use dev_err_probe()

Quoted 9 lines · On Thu, 30 Jul 2026 19:32:45 +0530 [email protected] wrote:

From: Mohammad Shahid <[email protected]>

Replace open-coded probe error handling with dev_err_probe() for resource acquisition and initialization failures.

This simplifies the error paths, avoids repetitive error handling, and automatically suppresses duplicate messages when -EPROBE_DEFER is returned while preserving the existing error messages.

Quoted 5 lines

Also remove the redundant error message after iproc_adc_enable(), allowing the error to be propagated without additional logging.

---

Hi Mohammad,

Please don't reply with a new patch version to to the previous patch, it breaks tools like b4 and appears weird in people's email clients.

Since this is just a matter of resending, please send the patch again (not replying to the previous thread) with the tag [RESEND PATCH] in the subject instead.

Thanks

Signature · 2 lines
Kind regards,
Joshua Crofts
#5 lore raw

Re: [PATCH v2] iio: adc: bcm_iproc_adc: Convert probe() to use dev_err_probe()

In reply to [email protected]
Quoted 9 lines · On Thu, Jul 30, 2026 at 07:32:45PM +0530, [email protected] wrote:

Replace open-coded probe error handling with dev_err_probe() for resource acquisition and initialization failures.

This simplifies the error paths, avoids repetitive error handling, and automatically suppresses duplicate messages when -EPROBE_DEFER is returned while preserving the existing error messages.

Also remove the redundant error message after iproc_adc_enable(), allowing the error to be propagated without additional logging.

...

Quoted 1 line

static int iproc_adc_probe(struct platform_device *pdev)

While at it, consider adding

	struct device *dev = &pdev->dev;

at the top of the function to simplify the below calls.

drivers/iio/adc/bcm_iproc_adc.c static int iproc_adc_probe(struct platform_device *pdev) · line 528

Quoted 11 lines
drivers/iio/adc/bcm_iproc_adc.c +4 -5
 	adc_priv->regmap = syscon_regmap_lookup_by_phandle(pdev->dev.of_node,
 			   "adc-syscon");
-	if (IS_ERR(adc_priv->regmap)) {
-		dev_err(&pdev->dev, "failed to get handle for tsc syscon\n");
-		ret = PTR_ERR(adc_priv->regmap);
-		return ret;
-	}
+	if (IS_ERR(adc_priv->regmap))
+		return dev_err_probe(&pdev->dev,
+				     PTR_ERR(adc_priv->regmap),
+				     "failed to get handle for tsc syscon\n");
		return dev_err_probe(dev, PTR_ERR(adc_priv->regmap),
				     "failed to get handle for tsc syscon\n");

drivers/iio/adc/bcm_iproc_adc.c static int iproc_adc_probe(struct platform_device *pdev) · line 534

Quoted 11 lines
drivers/iio/adc/bcm_iproc_adc.c +4 -6
 	adc_priv->adc_clk = devm_clk_get(&pdev->dev, "tsc_clk");
-	if (IS_ERR(adc_priv->adc_clk)) {
-		dev_err(&pdev->dev,
-			"failed getting clock tsc_clk\n");
-		ret = PTR_ERR(adc_priv->adc_clk);
-		return ret;
-	}
+	if (IS_ERR(adc_priv->adc_clk))
+		return dev_err_probe(&pdev->dev,
+				     PTR_ERR(adc_priv->adc_clk),
+				     "failed getting clock tsc_clk\n");

And here, and so on...

...

drivers/iio/adc/bcm_iproc_adc.c static int iproc_adc_probe(struct platform_device *pdev) · line 540

Quoted 6 lines
drivers/iio/adc/bcm_iproc_adc.c +3 -1
 	adc_priv->irqno = platform_get_irq(pdev, 0);
 	if (adc_priv->irqno < 0)
-		return adc_priv->irqno;
+		return dev_err_probe(&pdev->dev,
+				     adc_priv->irqno,
+				     "failed to get IRQ\n");

This is wrong. The above call print an error.

drivers/iio/adc/bcm_iproc_adc.c static int iproc_adc_probe(struct platform_device *pdev) · line 547

Quoted 10 lines
drivers/iio/adc/bcm_iproc_adc.c +4 -4
 	ret = regmap_clear_bits(adc_priv->regmap, IPROC_REGCTL2,
 				IPROC_ADC_AUXIN_SCAN_ENA);
-	if (ret) {
-		dev_err(&pdev->dev, "failed to write IPROC_REGCTL2 %d\n", ret);
-		return ret;
-	}
+	if (ret)
+		return dev_err_probe(&pdev->dev,
+				     ret,
+				     "failed to write IPROC_REGCTL2\n");

It's a one line still (with the above change):

		return dev_err_probe(dev, ret, "failed to write IPROC_REGCTL2\n");

drivers/iio/adc/bcm_iproc_adc.c static int iproc_adc_probe(struct platform_device *pdev)

Quoted 13 lines
drivers/iio/adc/bcm_iproc_adc.c +4 -4
 	ret = devm_request_threaded_irq(&pdev->dev, adc_priv->irqno,
 				iproc_adc_interrupt_handler,
 				iproc_adc_interrupt_thread,
 				IRQF_SHARED, "iproc-adc", indio_dev);
-	if (ret) {
-		dev_err(&pdev->dev, "request_irq error %d\n", ret);
-		return ret;
-	}
 
+	if (ret)
+		return dev_err_probe(&pdev->dev,
+				     ret,
+				     "failed to request IRQ\n");

This should be a separate patch to drop the dup message. The IRQ core prints it.

...

drivers/iio/adc/bcm_iproc_adc.c static int iproc_adc_probe(struct platform_device *pdev) · line 562

Quoted 3 lines
drivers/iio/adc/bcm_iproc_adc.c +3 -0
+		return dev_err_probe(&pdev->dev,
+				     ret,
+				     "failed to enable clock\n");

One line.

Signature · 2 lines
With Best Regards,
Andy Shevchenko