Commit f1164d33 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki

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: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: default avatarLukasz Luba <lukasz.luba@arm.com>
parent fec50db7
...@@ -32,7 +32,6 @@ static unsigned long get_target_state(struct thermal_instance *instance, ...@@ -32,7 +32,6 @@ static unsigned long get_target_state(struct thermal_instance *instance,
{ {
struct thermal_cooling_device *cdev = instance->cdev; struct thermal_cooling_device *cdev = instance->cdev;
unsigned long cur_state; unsigned long cur_state;
unsigned long next_target;
/* /*
* We keep this instance the way it is by default. * We keep this instance the way it is by default.
...@@ -40,32 +39,26 @@ static unsigned long get_target_state(struct thermal_instance *instance, ...@@ -40,32 +39,26 @@ static unsigned long get_target_state(struct thermal_instance *instance,
* cdev in use to determine the next_target. * cdev in use to determine the next_target.
*/ */
cdev->ops->get_cur_state(cdev, &cur_state); cdev->ops->get_cur_state(cdev, &cur_state);
next_target = instance->target;
dev_dbg(&cdev->device, "cur_state=%ld\n", cur_state); dev_dbg(&cdev->device, "cur_state=%ld\n", cur_state);
if (!instance->initialized) { if (!instance->initialized) {
if (throttle) { if (throttle)
next_target = clamp((cur_state + 1), instance->lower, instance->upper); return clamp(cur_state + 1, instance->lower, instance->upper);
} else {
next_target = THERMAL_NO_TARGET;
}
return next_target; return THERMAL_NO_TARGET;
} }
if (throttle) { if (throttle) {
if (trend == THERMAL_TREND_RAISING) if (trend == THERMAL_TREND_RAISING)
next_target = clamp((cur_state + 1), instance->lower, instance->upper); return clamp(cur_state + 1, instance->lower, instance->upper);
} else { } else if (trend == THERMAL_TREND_DROPPING) {
if (trend == THERMAL_TREND_DROPPING) {
if (cur_state <= instance->lower) if (cur_state <= instance->lower)
next_target = THERMAL_NO_TARGET; return THERMAL_NO_TARGET;
else
next_target = clamp((cur_state - 1), instance->lower, instance->upper); 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, static void thermal_zone_trip_update(struct thermal_zone_device *tz,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment