[PATCH v1 10/16] thermal: gov_step_wise: Clean up thermal_zone_trip_update()

Rafael J. Wysocki
2024-04-10T17:45:00Z

From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

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 diagnositc messages and locking.
* Use suitable field formatting in a message to avoid an explicit
cast to int.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
---
drivers/thermal/gov_step_wise.c | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)

Index: linux-pm/drivers/thermal/gov_step_wise.c
===================================================================
--- linux-pm.orig/drivers/thermal/gov_step_wise.c
+++ linux-pm/drivers/thermal/gov_step_wise.c
@@ -65,13 +65,10 @@ static void thermal_zone_trip_update(str
const struct thermal_trip *trip,
int trip_threshold)
{
+ enum thermal_trend trend = get_tz_trend(tz, trip);
int trip_id = thermal_zone_trip_id(tz, trip);
- enum thermal_trend trend;
struct thermal_instance *instance;
bool throttle = false;
- int old_target;
-
- trend = get_tz_trend(tz, trip);

if (tz->temperature >= trip_threshold) {
throttle = true;
@@ -82,13 +79,16 @@ static void thermal_zone_trip_update(str
trip_id, trip->type, trip_threshold, trend, throttle);

list_for_each_entry(instance, &tz->thermal_instances, tz_node) {
+ int old_target;
+
if (instance->trip != trip)
continue;

old_target = instance->target;
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)
continue;
@@ -104,6 +104,7 @@ static void thermal_zone_trip_update(str
}

instance->initialized = true;
+
mutex_lock(&instance->cdev->lock);
instance->cdev->updated = false; /* cdev needs update */
mutex_unlock(&instance->cdev->lock);