diff mbox series

[6/9] iio: adc: meson_saradc: Make use of the helper function dev_err_probe()

Message ID 20210927081426.762-6-caihuoqing@baidu.com (mailing list archive)
State Superseded
Headers show
Series [1/9] iio: adc: ab8500-gpadc: Make use of the helper function dev_err_probe() | expand

Commit Message

Cai,Huoqing Sept. 27, 2021, 8:14 a.m. UTC 
When possible use dev_err_probe help to properly deal with the
PROBE_DEFER error, the benefit is that DEFER issue will be logged
in the devices_deferred debugfs file.
Using dev_err_probe() can reduce code size, and the error value
gets printed.

Signed-off-by: Cai Huoqing <caihuoqing@baidu.com>
---
 drivers/iio/adc/meson_saradc.c | 43 +++++++++++++++++-----------------
 1 file changed, 21 insertions(+), 22 deletions(-)

Comments

Martin Blumenstingl Sept. 27, 2021, 8:09 p.m. UTC | #1 
Hello,

first of all: thanks for this patch!

On Mon, Sep 27, 2021 at 10:15 AM Cai Huoqing <caihuoqing@baidu.com> wrote:
[...]
> +       if (IS_ERR(priv->clkin))
> +               return dev_err_probe(&pdev->dev,
> +                                    PTR_ERR(priv->clkin),
Is there any specific reason why you put PTR_ERR() on a separate line?
it would still fit into the line above and be below the old 80 chars
per line limit.
For priv->vref you already have it the way I am suggesting there.

[...]
> +       if (IS_ERR(priv->core_clk))
> +               return dev_err_probe(&pdev->dev,
> +                                    PTR_ERR(priv->core_clk),
the same question as above applies here as well


Best regards,
Martin
Cai,Huoqing Sept. 28, 2021, 2:49 a.m. UTC | #2 
On 27 9月 21 22:09:47, Martin Blumenstingl wrote:
> Hello,
> 
> first of all: thanks for this patch!
> 
> On Mon, Sep 27, 2021 at 10:15 AM Cai Huoqing <caihuoqing@baidu.com> wrote:
> [...]
> > +       if (IS_ERR(priv->clkin))
> > +               return dev_err_probe(&pdev->dev,
> > +                                    PTR_ERR(priv->clkin),
> Is there any specific reason why you put PTR_ERR() on a separate line?
> it would still fit into the line above and be below the old 80 chars
> per line limit.
> For priv->vref you already have it the way I am suggesting there.
> 
> [...]
> > +       if (IS_ERR(priv->core_clk))
> > +               return dev_err_probe(&pdev->dev,
> > +                                    PTR_ERR(priv->core_clk),
> the same question as above applies here as well
> 
> 
> Best regards,
> Martin
Hi,

Thanks for your feedback.
I have resend v2 to fix it.
here
https://lore.kernel.org/linux-arm-kernel/20210928013621.1245-6-caihuoqing@baidu.com/

Many thanks
Cai
diff mbox series

Patch

diff --git a/drivers/iio/adc/meson_saradc.c b/drivers/iio/adc/meson_saradc.c
index 705d5e11a54b..014a77f98b98 100644
--- a/drivers/iio/adc/meson_saradc.c
+++ b/drivers/iio/adc/meson_saradc.c
@@ -1230,35 +1230,35 @@  static int meson_sar_adc_probe(struct platform_device *pdev)
 		return ret;
 
 	priv->clkin = devm_clk_get(&pdev->dev, "clkin");
-	if (IS_ERR(priv->clkin)) {
-		dev_err(&pdev->dev, "failed to get clkin\n");
-		return PTR_ERR(priv->clkin);
-	}
+	if (IS_ERR(priv->clkin))
+		return dev_err_probe(&pdev->dev,
+				     PTR_ERR(priv->clkin),
+				     "failed to get clkin\n");
 
 	priv->core_clk = devm_clk_get(&pdev->dev, "core");
-	if (IS_ERR(priv->core_clk)) {
-		dev_err(&pdev->dev, "failed to get core clk\n");
-		return PTR_ERR(priv->core_clk);
-	}
+	if (IS_ERR(priv->core_clk))
+		return dev_err_probe(&pdev->dev,
+				     PTR_ERR(priv->core_clk),
+				     "failed to get core clk\n");
 
 	priv->adc_clk = devm_clk_get(&pdev->dev, "adc_clk");
 	if (IS_ERR(priv->adc_clk)) {
-		if (PTR_ERR(priv->adc_clk) == -ENOENT) {
+		if (PTR_ERR(priv->adc_clk) == -ENOENT)
 			priv->adc_clk = NULL;
-		} else {
-			dev_err(&pdev->dev, "failed to get adc clk\n");
-			return PTR_ERR(priv->adc_clk);
-		}
+		else
+			return dev_err_probe(&pdev->dev,
+					     PTR_ERR(priv->adc_clk),
+					     "failed to get adc clk\n");
 	}
 
 	priv->adc_sel_clk = devm_clk_get(&pdev->dev, "adc_sel");
 	if (IS_ERR(priv->adc_sel_clk)) {
-		if (PTR_ERR(priv->adc_sel_clk) == -ENOENT) {
+		if (PTR_ERR(priv->adc_sel_clk) == -ENOENT)
 			priv->adc_sel_clk = NULL;
-		} else {
-			dev_err(&pdev->dev, "failed to get adc_sel clk\n");
-			return PTR_ERR(priv->adc_sel_clk);
-		}
+		else
+			return dev_err_probe(&pdev->dev,
+					     PTR_ERR(priv->adc_sel_clk),
+					     "failed to get adc_sel clk\n");
 	}
 
 	/* on pre-GXBB SoCs the SAR ADC itself provides the ADC clock: */
@@ -1269,10 +1269,9 @@  static int meson_sar_adc_probe(struct platform_device *pdev)
 	}
 
 	priv->vref = devm_regulator_get(&pdev->dev, "vref");
-	if (IS_ERR(priv->vref)) {
-		dev_err(&pdev->dev, "failed to get vref regulator\n");
-		return PTR_ERR(priv->vref);
-	}
+	if (IS_ERR(priv->vref))
+		return dev_err_probe(&pdev->dev, PTR_ERR(priv->vref),
+				     "failed to get vref regulator\n");
 
 	priv->calibscale = MILLION;