diff options
| author | Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com> | 2013-09-25 09:29:50 -0700 |
|---|---|---|
| committer | Zhang Rui <rui.zhang@intel.com> | 2013-09-30 13:39:50 +0800 |
| commit | e994d713a73716b54085a092b267099e40aa5513 (patch) | |
| tree | 3b9ade8914bd1a239f84f40554bd521542733362 /drivers/acpi/thermal.c | |
| parent | ece238fe0aabac2278f39803c7344e2f6ff0dca2 (diff) | |
| download | linux-stable-e994d713a73716b54085a092b267099e40aa5513.tar.gz linux-stable-e994d713a73716b54085a092b267099e40aa5513.tar.bz2 linux-stable-e994d713a73716b54085a092b267099e40aa5513.zip | |
ACPI/thermal : Remove zone disabled warning
Once thermal zone is disabled to move thermal control to user space,
too many warnings printed in logs. Remove pr_warn from this path,
instead warn when user mode issues request to disable thermal zone.
Signed-off-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Acked-by: Eduardo Valentin <eduardo.valentin@ti.com>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
Diffstat (limited to 'drivers/acpi/thermal.c')
| -rw-r--r-- | drivers/acpi/thermal.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c index 6a0329340b42..92bebb9d9438 100644 --- a/drivers/acpi/thermal.c +++ b/drivers/acpi/thermal.c @@ -515,10 +515,9 @@ static void acpi_thermal_check(void *data) { struct acpi_thermal *tz = data; - if (!tz->tz_enabled) { - pr_warn("thermal zone is disabled \n"); + if (!tz->tz_enabled) return; - } + thermal_zone_device_update(tz->thermal_zone); } @@ -570,9 +569,10 @@ static int thermal_set_mode(struct thermal_zone_device *thermal, */ if (mode == THERMAL_DEVICE_ENABLED) enable = 1; - else if (mode == THERMAL_DEVICE_DISABLED) + else if (mode == THERMAL_DEVICE_DISABLED) { enable = 0; - else + pr_warn("thermal zone will be disabled\n"); + } else return -EINVAL; if (enable != tz->tz_enabled) { |