Thermal: Fix DEFAULT_THERMAL_GOVERNOR

Fix DEFAULT_THERMAL_GOVERNOR to be consistant with the
default governor selected in kernel config file.

Signed-off-by: Zhang Rui <rui.zhang@intel.com>

diff --git a/drivers/thermal/step_wise.c b/drivers/thermal/step_wise.c
index 1242cff..0cd5e9f 100644 (file)
--- a/drivers/thermal/step_wise.c
+++ b/drivers/thermal/step_wise.c
@@ -170,7 +170,7 @@ static int step_wise_throttle(struct thermal_zone_device *tz, int trip)
 }
 
 static struct thermal_governor thermal_gov_step_wise = {
-       .name           = DEFAULT_THERMAL_GOVERNOR,
+       .name           = "step_wise",
        .throttle       = step_wise_throttle,
        .owner          = THIS_MODULE,
 };

diff --git a/include/linux/thermal.h b/include/linux/thermal.h
index 807f214..fe82022 100644 (file)
--- a/include/linux/thermal.h
+++ b/include/linux/thermal.h
@@ -46,8 +46,14 @@
 #define THERMAL_GENL_VERSION                    0x01
 #define THERMAL_GENL_MCAST_GROUP_NAME           "thermal_mc_group"
 
-/* Default Thermal Governor: Does Linear Throttling */
-#define DEFAULT_THERMAL_GOVERNOR       "step_wise"
+/* Default Thermal Governor */
+#if defined(CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE)
+#define DEFAULT_THERMAL_GOVERNOR       "step_wise"
+#elif defined(CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE)
+#define DEFAULT_THERMAL_GOVERNOR       "fair_share"
+#elif defined(CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE)
+#define DEFAULT_THERMAL_GOVERNOR       "user_space"
+#endif
 
 struct thermal_zone_device;
 struct thermal_cooling_device;