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

thermal: gov_step_wise: Clean up thermal_zone_trip_update()

Do some assorted cleanups in thermal_zone_trip_update():

 * Compute the trend value upfront.
 * Move old_target definition to the block where it is used.
 * Adjust white space around diagnostic messages and locking.
 * Use suitable field formatting in a message to avoid an explicit
   cast to int.
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: default avatarLukasz Luba <lukasz.luba@arm.com>
parent e4065f14
...@@ -65,13 +65,10 @@ static void thermal_zone_trip_update(struct thermal_zone_device *tz, ...@@ -65,13 +65,10 @@ static void thermal_zone_trip_update(struct thermal_zone_device *tz,
const struct thermal_trip *trip, const struct thermal_trip *trip,
int trip_threshold) int trip_threshold)
{ {
enum thermal_trend trend = get_tz_trend(tz, trip);
int trip_id = thermal_zone_trip_id(tz, trip); int trip_id = thermal_zone_trip_id(tz, trip);
enum thermal_trend trend;
struct thermal_instance *instance; struct thermal_instance *instance;
bool throttle = false; bool throttle = false;
int old_target;
trend = get_tz_trend(tz, trip);
if (tz->temperature >= trip_threshold) { if (tz->temperature >= trip_threshold) {
throttle = true; throttle = true;
...@@ -82,13 +79,16 @@ static void thermal_zone_trip_update(struct thermal_zone_device *tz, ...@@ -82,13 +79,16 @@ static void thermal_zone_trip_update(struct thermal_zone_device *tz,
trip_id, trip->type, trip_threshold, trend, throttle); trip_id, trip->type, trip_threshold, trend, throttle);
list_for_each_entry(instance, &tz->thermal_instances, tz_node) { list_for_each_entry(instance, &tz->thermal_instances, tz_node) {
int old_target;
if (instance->trip != trip) if (instance->trip != trip)
continue; continue;
old_target = instance->target; old_target = instance->target;
instance->target = get_target_state(instance, trend, throttle); instance->target = get_target_state(instance, trend, throttle);
dev_dbg(&instance->cdev->device, "old_target=%d, target=%d\n",
old_target, (int)instance->target); dev_dbg(&instance->cdev->device, "old_target=%d, target=%ld\n",
old_target, instance->target);
if (instance->initialized && old_target == instance->target) if (instance->initialized && old_target == instance->target)
continue; continue;
...@@ -104,6 +104,7 @@ static void thermal_zone_trip_update(struct thermal_zone_device *tz, ...@@ -104,6 +104,7 @@ static void thermal_zone_trip_update(struct thermal_zone_device *tz,
} }
instance->initialized = true; instance->initialized = true;
mutex_lock(&instance->cdev->lock); mutex_lock(&instance->cdev->lock);
instance->cdev->updated = false; /* cdev needs update */ instance->cdev->updated = false; /* cdev needs update */
mutex_unlock(&instance->cdev->lock); mutex_unlock(&instance->cdev->lock);
......
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