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

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

drivers/thermal/gov_step_wise.c

+10 −17
Original line number Diff line number Diff line
@@ -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) {

			return 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 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,