thermal: core: Fold two functions into their respective callers

Fold bind_cdev() into __thermal_cooling_device_register() and bind_tz()
into thermal_zone_device_register_with_trips() to reduce code bloat and
make it somewhat easier to follow the code flow.

No intentional functional impact.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: Zhang Rui <rui.zhang@intel.com>
Reviewed-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Link: https://patch.msgid.link/2962184.e9J7NaK4W3@rjwysocki.net

diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c
index 1b5d91e3c65343c5b79dd878a7a9a8f4b22d1d31..eb67693200063aeed13c1bc6c3e49a01d426a9fa 100644 (file)
--- a/drivers/thermal/thermal_core.c
+++ b/drivers/thermal/thermal_core.c
@@ -999,20 +999,6 @@ void print_bind_err_msg(struct thermal_zone_device *tz,
                tz->type, cdev->type, ret);
 }
 
-static void bind_cdev(struct thermal_cooling_device *cdev)
-{
-       int ret;
-       struct thermal_zone_device *pos = NULL;
-
-       list_for_each_entry(pos, &thermal_tz_list, node) {
-               if (pos->ops.bind) {
-                       ret = pos->ops.bind(pos, cdev);
-                       if (ret)
-                               print_bind_err_msg(pos, cdev, ret);
-               }
-       }
-}
-
 /**
  * __thermal_cooling_device_register() - register a new thermal cooling device
  * @np:                a pointer to a device tree node.
@@ -1108,7 +1094,13 @@ __thermal_cooling_device_register(struct device_node *np,
        list_add(&cdev->node, &thermal_cdev_list);
 
        /* Update binding information for 'this' new cdev */
-       bind_cdev(cdev);
+       list_for_each_entry(pos, &thermal_tz_list, node) {
+               if (pos->ops.bind) {
+                       ret = pos->ops.bind(pos, cdev);
+                       if (ret)
+                               print_bind_err_msg(pos, cdev, ret);
+               }
+       }
 
        list_for_each_entry(pos, &thermal_tz_list, node)
                if (atomic_cmpxchg(&pos->need_update, 1, 0))
@@ -1346,25 +1338,6 @@ void thermal_cooling_device_unregister(struct thermal_cooling_device *cdev)
 }
 EXPORT_SYMBOL_GPL(thermal_cooling_device_unregister);
 
-static void bind_tz(struct thermal_zone_device *tz)
-{
-       int ret;
-       struct thermal_cooling_device *pos = NULL;
-
-       if (!tz->ops.bind)
-               return;
-
-       mutex_lock(&thermal_list_lock);
-
-       list_for_each_entry(pos, &thermal_cdev_list, node) {
-               ret = tz->ops.bind(tz, pos);
-               if (ret)
-                       print_bind_err_msg(tz, pos, ret);
-       }
-
-       mutex_unlock(&thermal_list_lock);
-}
-
 static void thermal_set_delay_jiffies(unsigned long *delay_jiffies, int delay_ms)
 {
        *delay_jiffies = msecs_to_jiffies(delay_ms);
@@ -1562,13 +1535,23 @@ thermal_zone_device_register_with_trips(const char *type,
        }
 
        mutex_lock(&thermal_list_lock);
+
        mutex_lock(&tz->lock);
        list_add_tail(&tz->node, &thermal_tz_list);
        mutex_unlock(&tz->lock);
-       mutex_unlock(&thermal_list_lock);
 
        /* Bind cooling devices for this zone */
-       bind_tz(tz);
+       if (tz->ops.bind) {
+               struct thermal_cooling_device *cdev;
+
+               list_for_each_entry(cdev, &thermal_cdev_list, node) {
+                       result = tz->ops.bind(tz, cdev);
+                       if (result)
+                               print_bind_err_msg(tz, cdev, result);
+               }
+       }
+
+       mutex_unlock(&thermal_list_lock);
 
        thermal_zone_device_init(tz);
        /* Update the new thermal zone and mark it as already updated. */