thermal: gov_step_wise: Simplify get_target_state()

The step-wise governor's get_target_state() function contains redundant
braces, redundant parens and a redundant next_target local variable, so
get rid of all that stuff.

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 5436aa58d41ec78e353335f76d878f72890915f2..aad98e06d66b9d42a6420fc67f24ec4415273c51 100644 (file)
--- a/drivers/thermal/gov_step_wise.c
+++ b/drivers/thermal/gov_step_wise.c
@@ -32,7 +32,6 @@ static unsigned long get_target_state(struct thermal_instance *instance,
 {
        struct thermal_cooling_device *cdev = instance->cdev;
        unsigned long cur_state;
-       unsigned long next_target;
 
        /*
         * We keep this instance the way it is by default.
@@ -40,32 +39,26 @@ static unsigned long get_target_state(struct thermal_instance *instance,
         * cdev in use to determine the next_target.
         */
        cdev->ops->get_cur_state(cdev, &cur_state);
-       next_target = instance->target;
        dev_dbg(&cdev->device, "cur_state=%ld\n", cur_state);
 
        if (!instance->initialized) {
-               if (throttle) {
-                       next_target = clamp((cur_state + 1), instance->lower, instance->upper);
-               } else {
-                       next_target = THERMAL_NO_TARGET;
-               }
+               if (throttle)
+                       return clamp(cur_state + 1, instance->lower, instance->upper);
 
-               return next_target;
+               return THERMAL_NO_TARGET;
        }
 
        if (throttle) {
                if (trend == THERMAL_TREND_RAISING)
-                       next_target = clamp((cur_state + 1), instance->lower, instance->upper);
-       } else {
-               if (trend == THERMAL_TREND_DROPPING) {
-                       if (cur_state <= instance->lower)
-                               next_target = THERMAL_NO_TARGET;
-                       else
-                               next_target = clamp((cur_state - 1), instance->lower, instance->upper);
-               }
+                       return clamp(cur_state + 1, instance->lower, instance->upper);
+       } else if (trend == THERMAL_TREND_DROPPING) {
+               if (cur_state <= instance->lower)
+                       return THERMAL_NO_TARGET;
+
+               return clamp(cur_state - 1, instance->lower, instance->upper);
        }
 
-       return next_target;
+       return instance->target;
 }
 
 static void thermal_zone_trip_update(struct thermal_zone_device *tz,