thermal/of: Return -ENODEV instead of -EINVAL if registration fails
authorDaniel Lezcano <daniel.lezcano@linaro.org>
Tue, 9 Aug 2022 08:56:27 +0000 (10:56 +0200)
committerDaniel Lezcano <daniel.lezcano@linaro.org>
Wed, 17 Aug 2022 12:09:37 +0000 (14:09 +0200)
The previous version of the OF code was returning -ENODEV if no
thermal zones description was found or if the lookup of the sensor in
the thermal zones was not found.

The backend drivers are expecting this return value as an information
about skipping the sensor initialization and considered as normal.

Fix the return value by replacing -EINVAL by -ENODEV and remove the
error message as this missing is not considered as an error.

Fixes: 3bd52ac87347 ("thermal/of: Rework the thermal device tree initialization")
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Tested-by: Michael Walle <michael@walle.cc>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Link: https://lore.kernel.org/r/20220809085629.509116-2-daniel.lezcano@linaro.org
drivers/thermal/thermal_of.c

index 15b342fa81d6dbcb220a7ba5deb096159c9c1256..072e05477855aa81ab9ee95f0ccc37b7925a99d1 100644 (file)
@@ -1062,8 +1062,8 @@ static struct device_node *of_thermal_zone_find(struct device_node *sensor, int
 
        np = of_find_node_by_name(NULL, "thermal-zones");
        if (!np) {
-               pr_err("Unable to find thermal zones description\n");
-               return ERR_PTR(-EINVAL);
+               pr_debug("No thermal zones description\n");
+               return ERR_PTR(-ENODEV);
        }
 
        /*
@@ -1102,7 +1102,7 @@ static struct device_node *of_thermal_zone_find(struct device_node *sensor, int
                        }
                }
        }
-       tz = ERR_PTR(-EINVAL);
+       tz = ERR_PTR(-ENODEV);
 out:
        of_node_put(np);
        return tz;
@@ -1376,7 +1376,8 @@ struct thermal_zone_device *thermal_of_zone_register(struct device_node *sensor,
 
        np = of_thermal_zone_find(sensor, id);
        if (IS_ERR(np)) {
-               pr_err("Failed to find thermal zone for %pOFn id=%d\n", sensor, id);
+               if (PTR_ERR(np) != -ENODEV)
+                       pr_err("Failed to find thermal zone for %pOFn id=%d\n", sensor, id);
                return ERR_CAST(np);
        }