thermal/of: Make new code and old code co-exist

This transient change allows to use old and new OF together until all
the drivers are converted to use the new OF API.

This will go away when the old OF code will be removed.

Signed-off-by: Daniel Lezcano <daniel.lezcano@linexp.org>
Link: https://lore.kernel.org/r/20220804224349.1926752-3-daniel.lezcano@linexp.org
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>

diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c
index 50d50cec777403ff241082c50459785add7c0993..69447aba7e656cb32d2d4d25ad23ac618b62d757 100644 (file)
--- a/drivers/thermal/thermal_core.c
+++ b/drivers/thermal/thermal_core.c
@@ -1492,10 +1492,6 @@ static int __init thermal_init(void)
        if (result)
                goto unregister_governors;
 
-       result = of_parse_thermal_zones();
-       if (result)
-               goto unregister_class;
-
        result = register_pm_notifier(&thermal_pm_nb);
        if (result)
                pr_warn("Thermal: Can not register suspend notifier, return %d\n",
@@ -1503,8 +1499,6 @@ static int __init thermal_init(void)
 
        return 0;
 
-unregister_class:
-       class_unregister(&thermal_class);
 unregister_governors:
        thermal_unregister_governors();
 error:

diff --git a/drivers/thermal/thermal_of.c b/drivers/thermal/thermal_of.c
index c5cbe254a4f13889ae521e704d1bdac2bc8f291b..a17087c9295da4060f25a6b54e009a391ec14bc9 100644 (file)
--- a/drivers/thermal/thermal_of.c
+++ b/drivers/thermal/thermal_of.c
@@ -485,6 +485,15 @@ thermal_zone_of_sensor_register(struct device *dev, int sensor_id, void *data,
 {
        struct device_node *np, *child, *sensor_np;
        struct thermal_zone_device *tzd = ERR_PTR(-ENODEV);
+       static int old_tz_initialized;
+       int ret;
+
+       if (!old_tz_initialized) {
+               ret = of_parse_thermal_zones();
+               if (ret)
+                       return ERR_PTR(ret);
+               old_tz_initialized = 1;
+       }
 
        np = of_find_node_by_name(NULL, "thermal-zones");
        if (!np)
@@ -1004,7 +1013,7 @@ free_tz:
        return ERR_PTR(ret);
 }
 
-static __init void of_thermal_free_zone(struct __thermal_zone *tz)
+static void of_thermal_free_zone(struct __thermal_zone *tz)
 {
        struct __thermal_bind_params *tbp;
        int i, j;
@@ -1523,7 +1532,7 @@ EXPORT_SYMBOL_GPL(devm_thermal_of_zone_unregister);
  * Return: 0 on success, proper error code otherwise
  *
  */
-int __init of_parse_thermal_zones(void)
+int of_parse_thermal_zones(void)
 {
        struct device_node *np, *child;
        struct __thermal_zone *tz;