thermal: core: Rearrange __thermal_zone_device_update()

In preparation for subsequent changes, move the invocations of
thermal_thresholds_handle() and thermal_zone_set_trips() in
__thermal_zone_device_update() after the processing of the
temporary trip lists.

No intentional functional impact.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: Lukasz Luba <lukasz.luba@arm.com>
Link: https://patch.msgid.link/3323276.44csPzL39Z@rjwysocki.net

diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c
index 9252c89ec38e5243ba5741a3aa29d8ea0fa8973b..f83c5c67cbe50fcba852b25f51b5e050e1a740dd 100644 (file)
--- a/drivers/thermal/thermal_core.c
+++ b/drivers/thermal/thermal_core.c
@@ -588,10 +588,6 @@ void __thermal_zone_device_update(struct thermal_zone_device *tz,
                        high = td->threshold;
        }
 
-       thermal_thresholds_handle(tz, &low, &high);
-
-       thermal_zone_set_trips(tz, low, high);
-
        list_for_each_entry_safe(td, next, &way_up_list, list_node) {
                thermal_trip_crossed(tz, &td->trip, governor, true);
                list_del_init(&td->list_node);
@@ -602,6 +598,10 @@ void __thermal_zone_device_update(struct thermal_zone_device *tz,
                list_del_init(&td->list_node);
        }
 
+       thermal_thresholds_handle(tz, &low, &high);
+
+       thermal_zone_set_trips(tz, low, high);
+
        if (governor->manage)
                governor->manage(tz);