From e994d713a73716b54085a092b267099e40aa5513 Mon Sep 17 00:00:00 2001 From: Srinivas Pandruvada Date: Wed, 25 Sep 2013 09:29:50 -0700 Subject: [PATCH] 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 Acked-by: Eduardo Valentin Signed-off-by: Zhang Rui --- drivers/acpi/thermal.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c index 6a03293..92bebb9 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) { -- 2.7.4