OSDN Git Service

ACPI/thermal : Remove zone disabled warning
authorSrinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Wed, 25 Sep 2013 16:29:50 +0000 (09:29 -0700)
committerZhang Rui <rui.zhang@intel.com>
Mon, 30 Sep 2013 05:39:50 +0000 (13:39 +0800)
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>
drivers/acpi/thermal.c

index 6a03293..92bebb9 100644 (file)
@@ -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) {