thermal: gov_bang_bang: Clean up thermal_zone_trip_update()
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Wed, 10 Apr 2024 16:05:44 +0000 (18:05 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 23 Apr 2024 18:38:06 +0000 (20:38 +0200)
Do the following cleanups in thermal_zone_trip_update():

 * Drop the useless "zero hysteresis" message.
 * Eliminate the trip_index local variable that is redundant.
 * Drop 2 comments that are not useful.
 * Downgrade a diagnostic message from pr_warn() to pr_debug().
 * Use consistent field formatting in diagnostic messages.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: Lukasz Luba <lukasz.luba@arm.com>
Acked-by: Daniel Lezcano <daniel.lezcano@linaro.org>
drivers/thermal/gov_bang_bang.c

index 5a9095a6d9ea9518e3d8436b64e01a5a245898cd..ffc800484b8f8ef6bb8a2125c4d53810c2ebdc01 100644 (file)
@@ -17,29 +17,23 @@ static void thermal_zone_trip_update(struct thermal_zone_device *tz,
                                     const struct thermal_trip *trip,
                                     bool crossed_up)
 {
-       int trip_index = thermal_zone_trip_id(tz, trip);
        struct thermal_instance *instance;
 
-       if (!trip->hysteresis)
-               dev_info_once(&tz->device,
-                             "Zero hysteresis value for thermal zone %s\n", tz->type);
-
        dev_dbg(&tz->device, "Trip%d[temp=%d]:temp=%d:hyst=%d\n",
-                               trip_index, trip->temperature, tz->temperature,
-                               trip->hysteresis);
+               thermal_zone_trip_id(tz, trip), trip->temperature,
+               tz->temperature, trip->hysteresis);
 
        list_for_each_entry(instance, &tz->thermal_instances, tz_node) {
                if (instance->trip != trip)
                        continue;
 
-               /* in case fan is in initial state, switch the fan off */
                if (instance->target == THERMAL_NO_TARGET)
                        instance->target = 0;
 
-               /* in case fan is neither on nor off set the fan to active */
                if (instance->target != 0 && instance->target != 1) {
-                       pr_warn("Thermal instance %s controlled by bang-bang has unexpected state: %ld\n",
-                                       instance->name, instance->target);
+                       pr_debug("Unexpected state %ld of thermal instance %s in bang-bang\n",
+                                instance->target, instance->name);
+
                        instance->target = 1;
                }
 
@@ -52,8 +46,7 @@ static void thermal_zone_trip_update(struct thermal_zone_device *tz,
                else if (instance->target == 1 && !crossed_up)
                        instance->target = 0;
 
-               dev_dbg(&instance->cdev->device, "target=%d\n",
-                                       (int)instance->target);
+               dev_dbg(&instance->cdev->device, "target=%ld\n", instance->target);
 
                mutex_lock(&instance->cdev->lock);
                instance->cdev->updated = false; /* cdev needs update */