2021-10-08 09:30:43

by Cai,Huoqing

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

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 <[email protected]>
---
v1->v2: Remove the separate line of PTR_ERR().

drivers/iio/adc/meson_saradc.c | 39 +++++++++++++++-------------------
1 file changed, 17 insertions(+), 22 deletions(-)

diff --git a/drivers/iio/adc/meson_saradc.c b/drivers/iio/adc/meson_saradc.c
index 705d5e11a54b..62cc6fb0ef85 100644
--- a/drivers/iio/adc/meson_saradc.c
+++ b/drivers/iio/adc/meson_saradc.c
@@ -1230,35 +1230,31 @@ 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 +1265,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;

--
2.25.1

2021-10-10 16:22:28

by Jonathan Cameron

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

On Fri, 8 Oct 2021 17:28:54 +0800
Cai Huoqing <[email protected]> wrote:

> 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 <[email protected]>
Make sure you don't miss any tags on previous versions. This had:

Reviewed-by: Martin Blumenstingl <[email protected]>
Tested-by: Martin Blumenstingl <[email protected]> #Meson8b Odroid-C1


> v1->v2: Remove the separate line of PTR_ERR().
>
> drivers/iio/adc/meson_saradc.c | 39 +++++++++++++++-------------------
> 1 file changed, 17 insertions(+), 22 deletions(-)
>
> diff --git a/drivers/iio/adc/meson_saradc.c b/drivers/iio/adc/meson_saradc.c
> index 705d5e11a54b..62cc6fb0ef85 100644
> --- a/drivers/iio/adc/meson_saradc.c
> +++ b/drivers/iio/adc/meson_saradc.c
> @@ -1230,35 +1230,31 @@ 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 +1265,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;
>