Commit 4526c581 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki

thermal: gov_bang_bang: Clean up thermal_zone_trip_update()

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: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: default avatarLukasz Luba <lukasz.luba@arm.com>
Acked-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
parent 530c932b
...@@ -17,29 +17,23 @@ static void thermal_zone_trip_update(struct thermal_zone_device *tz, ...@@ -17,29 +17,23 @@ static void thermal_zone_trip_update(struct thermal_zone_device *tz,
const struct thermal_trip *trip, const struct thermal_trip *trip,
bool crossed_up) bool crossed_up)
{ {
int trip_index = thermal_zone_trip_id(tz, trip);
struct thermal_instance *instance; 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", dev_dbg(&tz->device, "Trip%d[temp=%d]:temp=%d:hyst=%d\n",
trip_index, trip->temperature, tz->temperature, thermal_zone_trip_id(tz, trip), trip->temperature,
trip->hysteresis); tz->temperature, trip->hysteresis);
list_for_each_entry(instance, &tz->thermal_instances, tz_node) { list_for_each_entry(instance, &tz->thermal_instances, tz_node) {
if (instance->trip != trip) if (instance->trip != trip)
continue; continue;
/* in case fan is in initial state, switch the fan off */
if (instance->target == THERMAL_NO_TARGET) if (instance->target == THERMAL_NO_TARGET)
instance->target = 0; instance->target = 0;
/* in case fan is neither on nor off set the fan to active */
if (instance->target != 0 && instance->target != 1) { if (instance->target != 0 && instance->target != 1) {
pr_warn("Thermal instance %s controlled by bang-bang has unexpected state: %ld\n", pr_debug("Unexpected state %ld of thermal instance %s in bang-bang\n",
instance->name, instance->target); instance->target, instance->name);
instance->target = 1; instance->target = 1;
} }
...@@ -52,8 +46,7 @@ static void thermal_zone_trip_update(struct thermal_zone_device *tz, ...@@ -52,8 +46,7 @@ static void thermal_zone_trip_update(struct thermal_zone_device *tz,
else if (instance->target == 1 && !crossed_up) else if (instance->target == 1 && !crossed_up)
instance->target = 0; instance->target = 0;
dev_dbg(&instance->cdev->device, "target=%d\n", dev_dbg(&instance->cdev->device, "target=%ld\n", instance->target);
(int)instance->target);
mutex_lock(&instance->cdev->lock); mutex_lock(&instance->cdev->lock);
instance->cdev->updated = false; /* cdev needs update */ instance->cdev->updated = false; /* cdev needs update */
......
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