Commit 1f53ef17 authored by Zhang Rui's avatar Zhang Rui
Browse files

Thermal: Fix DEFAULT_THERMAL_GOVERNOR 



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

Signed-off-by: default avatarZhang Rui <rui.zhang@intel.com>
parent d567c686

drivers/thermal/step_wise.c

+1 −1
Original line number Diff line number Diff line
@@ -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,

};

include/linux/thermal.h

+8 −2
Original line number Diff line number Diff line
@@ -46,8 +46,14 @@ 
#define THERMAL_GENL_VERSION                    0x01

#define THERMAL_GENL_MCAST_GROUP_NAME           "thermal_mc_group"



/* Default Thermal Governor: Does Linear Throttling */

/* 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;