Re: [PATCH v4 3/3] iio: adc: bcm_iproc_adc: Convert probe error handling to dev_err_probe()
David Lechner <[email protected]> Sat, 1 Aug 2026 09:51:34 -0500
| Newsgroups | org.kernel.vger.linux-iio,org.infradead.lists.linux-arm-kernel,org.kernel.vger.linux-kernel |
|---|---|
| Message-ID | <[email protected]> |
On 8/1/26 4:09 AM, [email protected] wrote: > From: Mohammad Shahid <[email protected]> > > This simplifies the probe error handling by replacing open-coded > dev_err() and return sequences while preserving the existing > messages. > > Signed-off-by: Mohammad Shahid <[email protected]> > --- > drivers/iio/adc/bcm_iproc_adc.c | 39 +++++++++++++++------------------ > 1 file changed, 18 insertions(+), 21 deletions(-) > > diff --git a/drivers/iio/adc/bcm_iproc_adc.c b/drivers/iio/adc/bcm_iproc_adc.c > index 4acd9c3f089b..5fcd528eb88a 100644 > --- a/drivers/iio/adc/bcm_iproc_adc.c > +++ b/drivers/iio/adc/bcm_iproc_adc.c > @@ -523,19 +523,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(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), Probably fine to put this on the same line as dev since it won't be any longer than the text below. > + "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(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), same > + "failed getting clock tsc_clk\n"); > > adc_priv->irqno = platform_get_irq(pdev, 0); > if (adc_priv->irqno < 0) > @@ -543,10 +540,10 @@ 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(dev, "failed to write IPROC_REGCTL2 %d\n", ret); > - return ret; > - } > + if (ret) > + return dev_err_probe(dev, > + ret, dev and ret should be on the same line. > + "failed to write IPROC_REGCTL2\n"); > > ret = devm_request_threaded_irq(dev, adc_priv->irqno, > iproc_adc_interrupt_handler, > @@ -556,11 +553,10 @@ static int iproc_adc_probe(struct platform_device *pdev) > return ret; > > ret = clk_prepare_enable(adc_priv->adc_clk); > - if (ret) { > - dev_err(dev, > - "clk_prepare_enable failed %d\n", ret); > - return ret; > - } > + if (ret) > + return dev_err_probe(dev, > + ret, same > + "failed to enable clock\n"); > > ret = iproc_adc_enable(indio_dev); > if (ret) > @@ -574,7 +570,8 @@ static int iproc_adc_probe(struct platform_device *pdev) > > ret = iio_device_register(indio_dev); > if (ret) { > - dev_err(dev, "iio_device_register failed:err %d\n", ret); > + dev_err_probe(dev, ret, > + "failed to register IIO device\n"); > goto err_clk; > } >