thermal: gov_bang_bang: Drop unnecessary cooling device target state checks

[ Upstream commit 2c637af8a74d9a2a52ee5456a75dd29c8cb52da5 ]

Some cooling device target state checks in bang_bang_control()
done before setting the new target state are not necessary after
recent changes, so drop them.

Also avoid updating the target state before checking it for
unexpected values.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Stable-dep-of: 84248e35d9b6 ("thermal: gov_bang_bang: Split bang_bang_control()")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/thermal/gov_bang_bang.c b/drivers/thermal/gov_bang_bang.c
index 2a6a651e9d921d1afc54a4064a1cba8f5db1d00f..b9474c6af72b51e540e1d9cc15110cb0682ccfce 100644 (file)
--- a/drivers/thermal/gov_bang_bang.c
+++ b/drivers/thermal/gov_bang_bang.c
@@ -57,24 +57,16 @@ static void bang_bang_control(struct thermal_zone_device *tz,
                if (instance->trip != trip)
                        continue;
 
-               if (instance->target == THERMAL_NO_TARGET)
-                       instance->target = 0;
-
-               if (instance->target != 0 && instance->target != 1) {
+               if (instance->target != 0 && instance->target != 1 &&
+                   instance->target != THERMAL_NO_TARGET)
                        pr_debug("Unexpected state %ld of thermal instance %s in bang-bang\n",
                                 instance->target, instance->name);
 
-                       instance->target = 1;
-               }
-
                /*
                 * Enable the fan when the trip is crossed on the way up and
                 * disable it when the trip is crossed on the way down.
                 */
-               if (instance->target == 0 && crossed_up)
-                       instance->target = 1;
-               else if (instance->target == 1 && !crossed_up)
-                       instance->target = 0;
+               instance->target = crossed_up;
 
                dev_dbg(&instance->cdev->device, "target=%ld\n", instance->target);