Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux

Pull thermal management updates from Zhang Rui:
 "This time we only have a few changes as there are no soc thermal
  changes from Eduardo.  The only big change is the introduction of
  TMON, a tool to help visualize, tune, and test the thermal subsystem.
  The rest is mostly cleanups and fixes all over.

  Specifics:

   - introduce TMON, a tool base on thermal sysfs I/F.  It can be used
     to visualize, tune and test the thermal subsystem.

   - fix a zone/cooling device binding problem, when both thermal zone
     bind parameters and .bind() callback are available"

* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux:
  tools/thermal: Introduce tmon, a tool for thermal subsystem
  thermal: Fix binding problem when there is thermal zone params
  thermal: cpu_cooling: fix return value check in cpufreq_cooling_register()
  Thermal: Check for validity before doing kfree
  thermal/intel_powerclamp: Add newer CPU models
  Thermal: Tidy up error handling in powerclamp_init
  thermal: Kconfig: cosmetic fixes
  ACPI/thermal : Remove zone disabled warning
  typo in drivers/thermal/Kconfig: lpatform instead of platform

1 files changed, 5 insertions, 5 deletions

diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c
index e600b5dbfcb6..0d9f46b5ae6d 100644
--- a/drivers/acpi/thermal.c
+++ b/drivers/acpi/thermal.c
@@ -514,10 +514,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);
 }
 
@@ -569,9 +568,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) {