diff mbox series

[thermal:,thermal/fixes] thermal: gov_step_wise: Simplify checks related to passive trips

Message ID 171568193709.10875.10665594485985186370.tip-bot2@tip-bot2
State New
Headers show
Series [thermal:,thermal/fixes] thermal: gov_step_wise: Simplify checks related to passive trips | expand

Commit Message

thermal-bot for Julien Panis May 14, 2024, 10:18 a.m. UTC 
The following commit has been merged into the thermal/fixes branch of thermal:

Commit-ID:     053b852c46626250b5f7da43ba8574da756db022
Gitweb:        https://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git//053b852c46626250b5f7da43ba8574da756db022
Author:        Rafael J. Wysocki <rafael.j.wysocki@intel.com>
AuthorDate:    Wed, 03 Apr 2024 20:12:02 +02:00
Committer:     Rafael J. Wysocki <rafael.j.wysocki@intel.com>
CommitterDate: Mon, 08 Apr 2024 15:57:50 +02:00

thermal: gov_step_wise: Simplify checks related to passive trips

Make it more clear from the code flow that the passive polling status
updates only take place for passive trip points.

No intentional functional impact.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: Lukasz Luba <lukasz.luba@arm.com>
---
 drivers/thermal/gov_step_wise.c | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)
diff mbox series

Patch

diff --git a/drivers/thermal/gov_step_wise.c b/drivers/thermal/gov_step_wise.c
index aad98e0..ee2fb4e 100644
--- a/drivers/thermal/gov_step_wise.c
+++ b/drivers/thermal/gov_step_wise.c
@@ -92,15 +92,13 @@  static void thermal_zone_trip_update(struct thermal_zone_device *tz,
 		if (instance->initialized && old_target == instance->target)
 			continue;
 
-		if (old_target == THERMAL_NO_TARGET &&
-		    instance->target != THERMAL_NO_TARGET) {
-			/* Activate a passive thermal instance */
-			if (trip->type == THERMAL_TRIP_PASSIVE)
+		if (trip->type == THERMAL_TRIP_PASSIVE) {
+			/* If needed, update the status of passive polling. */
+			if (old_target == THERMAL_NO_TARGET &&
+			    instance->target != THERMAL_NO_TARGET)
 				tz->passive++;
-		} else if (old_target != THERMAL_NO_TARGET &&
-			   instance->target == THERMAL_NO_TARGET) {
-			/* Deactivate a passive thermal instance */
-			if (trip->type == THERMAL_TRIP_PASSIVE)
+			else if (old_target != THERMAL_NO_TARGET &&
+				 instance->target == THERMAL_NO_TARGET)
 				tz->passive--;
 		}