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 <caihuoqing@baidu.com>
Reviewed-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Tested-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com> #Meson8b Odroid-C1
Link: https://lore.kernel.org/r/20211008092858.495-6-caihuoqing@baidu.com
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

diff --git a/drivers/iio/adc/meson_saradc.c b/drivers/iio/adc/meson_saradc.c
index 705d5e11a54be50cfa23430ca2ad162effc5de56..62cc6fb0ef85145009ce4f0b474d899f238fdf44 100644 (file)
--- 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;