thermal: gov_bang_bang: Split bang_bang_control()

Move the setting of the thermal instance target state from
bang_bang_control() into a separate function that will be also called
in a different place going forward.

No intentional functional impact.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: Peter Kästle <peter@piie.net>
Reviewed-by: Zhang Rui <rui.zhang@intel.com>
Cc: 6.10+ <stable@vger.kernel.org> # 6.10+
Link: https://patch.msgid.link/3313587.aeNJFYEL58@rjwysocki.net

diff --git a/drivers/thermal/gov_bang_bang.c b/drivers/thermal/gov_bang_bang.c
index b9474c6af72b51e540e1d9cc15110cb0682ccfce..87cff3ea77a9d9f70c5a22d7e37de8bcbfed58e9 100644 (file)
--- a/drivers/thermal/gov_bang_bang.c
+++ b/drivers/thermal/gov_bang_bang.c
@@ -13,6 +13,27 @@
 
 #include "thermal_core.h"
 
+static void bang_bang_set_instance_target(struct thermal_instance *instance,
+                                         unsigned int target)
+{
+       if (instance->target != 0 && instance->target != 1 &&
+           instance->target != THERMAL_NO_TARGET)
+               pr_debug("Unexpected state %ld of thermal instance %s in bang-bang\n",
+                        instance->target, instance->name);
+
+       /*
+        * Enable the fan when the trip is crossed on the way up and disable it
+        * when the trip is crossed on the way down.
+        */
+       instance->target = target;
+
+       dev_dbg(&instance->cdev->device, "target=%ld\n", instance->target);
+
+       mutex_lock(&instance->cdev->lock);
+       __thermal_cdev_update(instance->cdev);
+       mutex_unlock(&instance->cdev->lock);
+}
+
 /**
  * bang_bang_control - controls devices associated with the given zone
  * @tz: thermal_zone_device
@@ -54,25 +75,8 @@ static void bang_bang_control(struct thermal_zone_device *tz,
                tz->temperature, trip->hysteresis);
 
        list_for_each_entry(instance, &tz->thermal_instances, tz_node) {
-               if (instance->trip != trip)
-                       continue;
-
-               if (instance->target != 0 && instance->target != 1 &&
-                   instance->target != THERMAL_NO_TARGET)
-                       pr_debug("Unexpected state %ld of thermal instance %s in bang-bang\n",
-                                instance->target, instance->name);
-
-               /*
-                * Enable the fan when the trip is crossed on the way up and
-                * disable it when the trip is crossed on the way down.
-                */
-               instance->target = crossed_up;
-
-               dev_dbg(&instance->cdev->device, "target=%ld\n", instance->target);
-
-               mutex_lock(&instance->cdev->lock);
-               __thermal_cdev_update(instance->cdev);
-               mutex_unlock(&instance->cdev->lock);
+               if (instance->trip == trip)
+                       bang_bang_set_instance_target(instance, crossed_up);
        }
 }