thermal: Only set passive_delay for forced_passive cooling
PATCH 9/12 thermal: Only set passive_delay for forced_passive cooling
From: Frans Pop <[email protected]>
Setting polling_delay is useless as passive_delay has priority, so the value shown in proc isn't the actual polling delay. It also gives the impression to the user that he can change the polling interval through proc, while in fact he can't.
Also, unset passive_delay when the forced passive trip point is unbound to allow polling to be disabled.
Signed-off-by Frans Pop <[email protected]>
Acked-by Matthew Garrett <[email protected]>
Cc Zhang Rui <[email protected]>
Cc Len Brown <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
drivers/thermal/thermal_sys.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
drivers/thermal/thermal_sys.c renamed from drivers/thermal/thermal_sys.c~thermal-only-set-passive_delay-for-forced_passive-cooling +3 -6
@@ -241,6 +241,8 @@ passive_store(struct device *dev, struct cdev); }mutex_unlock (&thermal_list_lock); +if (!tz->passive_delay) + tz->passive_delay =1000 ; }else if (!state && tz->forced_passive) {mutex_lock (&thermal_list_lock);list_for_each_entry (cdev, &thermal_cdev_list, node) {
@@ -251,17 +253,12 @@ passive_store(struct device *dev, struct cdev); }mutex_unlock (&thermal_list_lock); + tz->passive_delay =0 ; } tz->tc1 =1 ; tz->tc2 =1 ; -if (!tz->passive_delay) - tz->passive_delay =1000 ; - -if (!tz->polling_delay) - tz->polling_delay =10000 ; - tz->forced_passive = state;thermal_zone_device_update (tz);
_