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>

diff --git a/drivers/thermal/gov_step_wise.c b/drivers/thermal/gov_step_wise.c
index aad98e06d66b9d42a6420fc67f24ec4415273c51..ee2fb4e63d1478a696dfcbadd66ab28367a2f388 100644 (file)
--- 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--;
                }