[PATCH v5 3/3] iio: adc: bcm_iproc_adc: Convert probe error handling to dev_err_probe()
[email protected] Tue, 4 Aug 2026 22:35:21 +0530
| Newsgroups | gmane.linux.kernel.iio,gmane.linux.ports.arm.kernel,gmane.linux.kernel |
|---|---|
| Message-ID | <[email protected]> |
From: Mohammad Shahid <[email protected]> Replace open-coded dev_err() followed by return with dev_err_probe() for probe failures that immediately return. Leave error paths that jump to cleanup labels unchanged to reduce code churn. These paths will be converted separately together with the planned devm-managed cleanup using devm_add_action_or_reset(). Signed-off-by: Mohammad Shahid <[email protected]> --- drivers/iio/adc/bcm_iproc_adc.c | 31 ++++++++++++------------------- 1 file changed, 12 insertions(+), 19 deletions(-) diff --git a/drivers/iio/adc/bcm_iproc_adc.c b/drivers/iio/adc/bcm_iproc_adc.c index 312be7c12e58..9238dc8c8873 100644 --- a/drivers/iio/adc/bcm_iproc_adc.c +++ b/drivers/iio/adc/bcm_iproc_adc.c @@ -522,18 +522,14 @@ 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(dev, PTR_ERR(adc_priv->regmap), + "failed to get handle for tsc syscon\n"); adc_priv->adc_clk = devm_clk_get(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(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) @@ -541,10 +537,9 @@ static int iproc_adc_probe(struct platform_device *pdev) 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(dev, ret, + "failed to write IPROC_REGCTL2\n"); ret = devm_request_threaded_irq(dev, adc_priv->irqno, iproc_adc_interrupt_handler, @@ -554,11 +549,9 @@ static int iproc_adc_probe(struct platform_device *pdev) return ret; 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(dev, ret, + "failed to enable clock\n"); ret = iproc_adc_enable(indio_dev); if (ret) -- 2.43.0