thermal/drivers/qcom/temp-alarm: Use dev_err_probe

Use the dev_err_probe function instead of dev_err in the probe function
so that the printed message includes the return value and also handles
-EPROBE_DEFER nicely.

Signed-off-by: Luca Weiss <luca@z3ntu.xyz>
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Link: https://lore.kernel.org/r/20230625-spmi-temp-alarm-defer-v1-1-2d57acf36855@z3ntu.xyz

diff --git a/drivers/thermal/qcom/qcom-spmi-temp-alarm.c b/drivers/thermal/qcom/qcom-spmi-temp-alarm.c
index 2a3b3e21260fc4f7434fbae5ed73181bdc27dbd1..0e8ebfcd84c54e16f78dab615df562819ab07ba5 100644 (file)
--- a/drivers/thermal/qcom/qcom-spmi-temp-alarm.c
+++ b/drivers/thermal/qcom/qcom-spmi-temp-alarm.c
@@ -411,22 +411,19 @@ static int qpnp_tm_probe(struct platform_device *pdev)
        chip->base = res;
 
        ret = qpnp_tm_read(chip, QPNP_TM_REG_TYPE, &type);
-       if (ret < 0) {
-               dev_err(&pdev->dev, "could not read type\n");
-               return ret;
-       }
+       if (ret < 0)
+               return dev_err_probe(&pdev->dev, ret,
+                                    "could not read type\n");
 
        ret = qpnp_tm_read(chip, QPNP_TM_REG_SUBTYPE, &subtype);
-       if (ret < 0) {
-               dev_err(&pdev->dev, "could not read subtype\n");
-               return ret;
-       }
+       if (ret < 0)
+               return dev_err_probe(&pdev->dev, ret,
+                                    "could not read subtype\n");
 
        ret = qpnp_tm_read(chip, QPNP_TM_REG_DIG_MAJOR, &dig_major);
-       if (ret < 0) {
-               dev_err(&pdev->dev, "could not read dig_major\n");
-               return ret;
-       }
+       if (ret < 0)
+               return dev_err_probe(&pdev->dev, ret,
+                                    "could not read dig_major\n");
 
        if (type != QPNP_TM_TYPE || (subtype != QPNP_TM_SUBTYPE_GEN1
                                     && subtype != QPNP_TM_SUBTYPE_GEN2)) {
@@ -448,16 +445,13 @@ static int qpnp_tm_probe(struct platform_device *pdev)
         */
        chip->tz_dev = devm_thermal_of_zone_register(
                &pdev->dev, 0, chip, &qpnp_tm_sensor_ops);
-       if (IS_ERR(chip->tz_dev)) {
-               dev_err(&pdev->dev, "failed to register sensor\n");
-               return PTR_ERR(chip->tz_dev);
-       }
+       if (IS_ERR(chip->tz_dev))
+               return dev_err_probe(&pdev->dev, PTR_ERR(chip->tz_dev),
+                                    "failed to register sensor\n");
 
        ret = qpnp_tm_init(chip);
-       if (ret < 0) {
-               dev_err(&pdev->dev, "init failed\n");
-               return ret;
-       }
+       if (ret < 0)
+               return dev_err_probe(&pdev->dev, ret, "init failed\n");
 
        devm_thermal_add_hwmon_sysfs(&pdev->dev, chip->tz_dev);