Skip to content

Commit e254ec2

Browse files
committed
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 <[email protected]> Reviewed-by: Lukasz Luba <[email protected]> Link: https://patch.msgid.link/[email protected]
1 parent ca70d55 commit e254ec2

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

drivers/thermal/thermal_core.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -588,10 +588,6 @@ void __thermal_zone_device_update(struct thermal_zone_device *tz,
588588
high = td->threshold;
589589
}
590590

591-
thermal_thresholds_handle(tz, &low, &high);
592-
593-
thermal_zone_set_trips(tz, low, high);
594-
595591
list_for_each_entry_safe(td, next, &way_up_list, list_node) {
596592
thermal_trip_crossed(tz, &td->trip, governor, true);
597593
list_del_init(&td->list_node);
@@ -602,6 +598,10 @@ void __thermal_zone_device_update(struct thermal_zone_device *tz,
602598
list_del_init(&td->list_node);
603599
}
604600

601+
thermal_thresholds_handle(tz, &low, &high);
602+
603+
thermal_zone_set_trips(tz, low, high);
604+
605605
if (governor->manage)
606606
governor->manage(tz);
607607

0 commit comments

Comments
 (0)