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

thermal: gov_step_wise: Fold update_passive_instance() into its caller 



Fold update_passive_instance() into thermal_zone_trip_update() that is
its only caller so as to make the code in question easier to follow.

No intentional functional impact.

Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
Reviewed-by: default avatarLukasz Luba <lukasz.luba@arm.com>
parent 94be1d27

drivers/thermal/gov_step_wise.c

+10 −18
Original line number Diff line number Diff line
@@ -68,17 +68,6 @@ static unsigned long get_target_state(struct thermal_instance *instance, 
	return next_target;

}



static void update_passive_instance(struct thermal_zone_device *tz,

				enum thermal_trip_type type, int value)

{

	/*

	 * If value is +1, activate a passive instance.

	 * If value is -1, deactivate a passive instance.

	 */

	if (type == THERMAL_TRIP_PASSIVE)

		tz->passive += value;

}



static void thermal_zone_trip_update(struct thermal_zone_device *tz, int trip_id)

{

	const struct thermal_trip *trip = &tz->trips[trip_id];
@@ -109,14 +98,17 @@ static void thermal_zone_trip_update(struct thermal_zone_device *tz, int trip_id 
		if (instance->initialized && old_target == instance->target)

			continue;



		/* Activate a passive thermal instance */

		if (old_target == THERMAL_NO_TARGET &&

			instance->target != THERMAL_NO_TARGET)

			update_passive_instance(tz, trip->type, 1);

		    instance->target != THERMAL_NO_TARGET) {

			/* Activate a passive thermal instance */

			if (trip->type == THERMAL_TRIP_PASSIVE)

				tz->passive++;

		} else if (old_target != THERMAL_NO_TARGET &&

			   instance->target == THERMAL_NO_TARGET) {

			/* Deactivate a passive thermal instance */

		else if (old_target != THERMAL_NO_TARGET &&

			instance->target == THERMAL_NO_TARGET)

			update_passive_instance(tz, trip->type, -1);

			if (trip->type == THERMAL_TRIP_PASSIVE)

				tz->passive--;

		}



		instance->initialized = true;

		mutex_lock(&instance->cdev->lock);