thermal: gov_step_wise: Adjust code logic to match comment

For the algorithm of choosing the next target state in step_wise
governor, the code does the right thing but is implemented in a
way different from what the comment describes. And this hurts the code
readability.

As the logic in the comment is simpler, adjust the code logic to align
with the comment.

No functional change.

Signed-off-by: Zhang Rui <rui.zhang@intel.com>
[ rjw: Subject edit ]
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

diff --git a/drivers/thermal/gov_step_wise.c b/drivers/thermal/gov_step_wise.c
index 3f72a8e..1050fb4 100644 (file)
--- a/drivers/thermal/gov_step_wise.c
+++ b/drivers/thermal/gov_step_wise.c
@@ -53,24 +53,16 @@ static unsigned long get_target_state(struct thermal_instance *instance,
                return next_target;
        }
 
-       switch (trend) {
-       case THERMAL_TREND_RAISING:
-               if (throttle) {
+       if (throttle) {
+               if (trend == THERMAL_TREND_RAISING)
                        next_target = clamp((cur_state + 1), instance->lower, instance->upper);
-               }
-               break;
-       case THERMAL_TREND_DROPPING:
-               if (cur_state <= instance->lower) {
-                       if (!throttle)
+       } else {
+               if (trend == THERMAL_TREND_DROPPING) {
+                       if (cur_state <= instance->lower)
                                next_target = THERMAL_NO_TARGET;
-               } else {
-                       if (!throttle) {
+                       else
                                next_target = clamp((cur_state - 1), instance->lower, instance->upper);
-                       }
                }
-               break;
-       default:
-               break;
        }
 
        return next_target;