thermal: core: Rearrange PM notification code

[ Upstream commit 7ddca5885718c2683d75689aa065c9a3bb317e5a ]

Move the code run for each thermal zone by the thermal PM notify
handler to separate functions.

This will help to make some subsequent changes look somewhat more
straightforward, among other things.

No intentional functional impact.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Link: https://patch.msgid.link/2299090.iZASKD2KPV@rjwysocki.net
Reviewed-by: Lukasz Luba <lukasz.luba@arm.com>
Stable-dep-of: 7837fa8115e0 ("thermal: core: Mark thermal zones as initializing to start with")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c
index 468a0dae8c497ba433253edcfab6c391661ae5ab..728eca88a56afc0b8f541330345b936047ce1574 100644 (file)
--- a/drivers/thermal/thermal_core.c
+++ b/drivers/thermal/thermal_core.c
@@ -1706,6 +1706,48 @@ static void thermal_zone_device_resume(struct work_struct *work)
        mutex_unlock(&tz->lock);
 }
 
+static void thermal_zone_pm_prepare(struct thermal_zone_device *tz)
+{
+       mutex_lock(&tz->lock);
+
+       if (tz->resuming) {
+               /*
+                * thermal_zone_device_resume() queued up for this zone has not
+                * acquired the lock yet, so release it to let the function run
+                * and wait util it has done the work.
+                */
+               mutex_unlock(&tz->lock);
+
+               wait_for_completion(&tz->resume);
+
+               mutex_lock(&tz->lock);
+       }
+
+       tz->suspended = true;
+
+       mutex_unlock(&tz->lock);
+}
+
+static void thermal_zone_pm_complete(struct thermal_zone_device *tz)
+{
+       mutex_lock(&tz->lock);
+
+       cancel_delayed_work(&tz->poll_queue);
+
+       reinit_completion(&tz->resume);
+       tz->resuming = true;
+
+       /*
+        * Replace the work function with the resume one, which will restore the
+        * original work function and schedule the polling work if needed.
+        */
+       INIT_DELAYED_WORK(&tz->poll_queue, thermal_zone_device_resume);
+       /* Queue up the work without a delay. */
+       mod_delayed_work(system_freezable_power_efficient_wq, &tz->poll_queue, 0);
+
+       mutex_unlock(&tz->lock);
+}
+
 static int thermal_pm_notify(struct notifier_block *nb,
                             unsigned long mode, void *_unused)
 {
@@ -1717,27 +1759,8 @@ static int thermal_pm_notify(struct notifier_block *nb,
        case PM_SUSPEND_PREPARE:
                mutex_lock(&thermal_list_lock);
 
-               list_for_each_entry(tz, &thermal_tz_list, node) {
-                       mutex_lock(&tz->lock);
-
-                       if (tz->resuming) {
-                               /*
-                                * thermal_zone_device_resume() queued up for
-                                * this zone has not acquired the lock yet, so
-                                * release it to let the function run and wait
-                                * util it has done the work.
-                                */
-                               mutex_unlock(&tz->lock);
-
-                               wait_for_completion(&tz->resume);
-
-                               mutex_lock(&tz->lock);
-                       }
-
-                       tz->suspended = true;
-
-                       mutex_unlock(&tz->lock);
-               }
+               list_for_each_entry(tz, &thermal_tz_list, node)
+                       thermal_zone_pm_prepare(tz);
 
                mutex_unlock(&thermal_list_lock);
                break;
@@ -1746,27 +1769,8 @@ static int thermal_pm_notify(struct notifier_block *nb,
        case PM_POST_SUSPEND:
                mutex_lock(&thermal_list_lock);
 
-               list_for_each_entry(tz, &thermal_tz_list, node) {
-                       mutex_lock(&tz->lock);
-
-                       cancel_delayed_work(&tz->poll_queue);
-
-                       reinit_completion(&tz->resume);
-                       tz->resuming = true;
-
-                       /*
-                        * Replace the work function with the resume one, which
-                        * will restore the original work function and schedule
-                        * the polling work if needed.
-                        */
-                       INIT_DELAYED_WORK(&tz->poll_queue,
-                                         thermal_zone_device_resume);
-                       /* Queue up the work without a delay. */
-                       mod_delayed_work(system_freezable_power_efficient_wq,
-                                        &tz->poll_queue, 0);
-
-                       mutex_unlock(&tz->lock);
-               }
+               list_for_each_entry(tz, &thermal_tz_list, node)
+                       thermal_zone_pm_complete(tz);
 
                mutex_unlock(&thermal_list_lock);
                break;