diff options
author | Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com> | 2013-09-25 12:29:50 -0400 |
---|---|---|
committer | Zhang Rui <rui.zhang@intel.com> | 2013-09-30 01:39:50 -0400 |
commit | e994d713a73716b54085a092b267099e40aa5513 (patch) | |
tree | 3b9ade8914bd1a239f84f40554bd521542733362 /drivers | |
parent | ece238fe0aabac2278f39803c7344e2f6ff0dca2 (diff) |
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')
-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) | |||
515 | { | 515 | { |
516 | struct acpi_thermal *tz = data; | 516 | struct acpi_thermal *tz = data; |
517 | 517 | ||
518 | if (!tz->tz_enabled) { | 518 | if (!tz->tz_enabled) |
519 | pr_warn("thermal zone is disabled \n"); | ||
520 | return; | 519 | return; |
521 | } | 520 | |
522 | thermal_zone_device_update(tz->thermal_zone); | 521 | thermal_zone_device_update(tz->thermal_zone); |
523 | } | 522 | } |
524 | 523 | ||
@@ -570,9 +569,10 @@ static int thermal_set_mode(struct thermal_zone_device *thermal, | |||
570 | */ | 569 | */ |
571 | if (mode == THERMAL_DEVICE_ENABLED) | 570 | if (mode == THERMAL_DEVICE_ENABLED) |
572 | enable = 1; | 571 | enable = 1; |
573 | else if (mode == THERMAL_DEVICE_DISABLED) | 572 | else if (mode == THERMAL_DEVICE_DISABLED) { |
574 | enable = 0; | 573 | enable = 0; |
575 | else | 574 | pr_warn("thermal zone will be disabled\n"); |
575 | } else | ||
576 | return -EINVAL; | 576 | return -EINVAL; |
577 | 577 | ||
578 | if (enable != tz->tz_enabled) { | 578 | if (enable != tz->tz_enabled) { |