thermal/drivers/rockchip: Use dev_err_probe

Use dev_err_probe to simplify error printing in the driver's probe
routine.

Reviewed-by: Heiko Stuebner <heiko@sntech.de>
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Link: https://lore.kernel.org/r/20230308112253.15659-4-sebastian.reichel@collabora.com

diff --git a/drivers/thermal/rockchip_thermal.c b/drivers/thermal/rockchip_thermal.c
index 0a7e47e..472212d 100644 (file)
--- a/drivers/thermal/rockchip_thermal.c
+++ b/drivers/thermal/rockchip_thermal.c
@@ -1374,35 +1374,26 @@ static int rockchip_thermal_probe(struct platform_device *pdev)
                return PTR_ERR(thermal->regs);
 
        thermal->reset = devm_reset_control_array_get(&pdev->dev, false, false);
-       if (IS_ERR(thermal->reset)) {
-               error = PTR_ERR(thermal->reset);
-               dev_err(&pdev->dev, "failed to get tsadc reset: %d\n", error);
-               return error;
-       }
+       if (IS_ERR(thermal->reset))
+               return dev_err_probe(&pdev->dev, PTR_ERR(thermal->reset),
+                                    "failed to get tsadc reset.\n");
 
        thermal->clk = devm_clk_get_enabled(&pdev->dev, "tsadc");
-       if (IS_ERR(thermal->clk)) {
-               error = PTR_ERR(thermal->clk);
-               dev_err(&pdev->dev, "failed to get tsadc clock: %d\n", error);
-               return error;
-       }
+       if (IS_ERR(thermal->clk))
+               return dev_err_probe(&pdev->dev, PTR_ERR(thermal->clk),
+                                    "failed to get tsadc clock.\n");
 
        thermal->pclk = devm_clk_get_enabled(&pdev->dev, "apb_pclk");
-       if (IS_ERR(thermal->pclk)) {
-               error = PTR_ERR(thermal->pclk);
-               dev_err(&pdev->dev, "failed to get apb_pclk clock: %d\n",
-                       error);
-               return error;
-       }
+       if (IS_ERR(thermal->pclk))
+               return dev_err_probe(&pdev->dev, PTR_ERR(thermal->pclk),
+                                    "failed to get apb_pclk clock.\n");
 
        rockchip_thermal_reset_controller(thermal->reset);
 
        error = rockchip_configure_from_dt(&pdev->dev, np, thermal);
-       if (error) {
-               dev_err(&pdev->dev, "failed to parse device tree data: %d\n",
-                       error);
-               return error;
-       }
+       if (error)
+               return dev_err_probe(&pdev->dev, error,
+                               "failed to parse device tree data\n");
 
        thermal->chip->initialize(thermal->grf, thermal->regs,
                                  thermal->tshut_polarity);
@@ -1411,23 +1402,18 @@ static int rockchip_thermal_probe(struct platform_device *pdev)
                error = rockchip_thermal_register_sensor(pdev, thermal,
                                                &thermal->sensors[i],
                                                thermal->chip->chn_id[i]);
-               if (error) {
-                       dev_err(&pdev->dev,
-                               "failed to register sensor[%d] : error = %d\n",
-                               i, error);
-                       return error;
-               }
+               if (error)
+                       return dev_err_probe(&pdev->dev, error,
+                               "failed to register sensor[%d].\n", i);
        }
 
        error = devm_request_threaded_irq(&pdev->dev, irq, NULL,
                                          &rockchip_thermal_alarm_irq_thread,
                                          IRQF_ONESHOT,
                                          "rockchip_thermal", thermal);
-       if (error) {
-               dev_err(&pdev->dev,
-                       "failed to request tsadc irq: %d\n", error);
-               return error;
-       }
+       if (error)
+               return dev_err_probe(&pdev->dev, error,
+                                    "failed to request tsadc irq.\n");
 
        thermal->chip->control(thermal->regs, true);