Jelajahi Sumber

Thermal: rename thermal governor Kconfig option to avoid generic naming

Currently, we have three Kconfig options for thermal governors, aka,
CONFIG_FAIR_SHARE, CONFIG_USER_SPACE and CONFIG_STEP_WISE.
But these names are too generic that may bring confusion to users.

Rename them to CONFIG_THERMAL_GOV_FAIR_SHARE,
CONFIG_THERMAL_GOV_USER_SPACE, CONFIG_THERMAL_GOV_STEP_WISE
to avoid the generic naming.

Signed-off-by: Zhang Rui <rui.zhang@intel.com>
Zhang Rui 13 tahun lalu
induk
melakukan
9d185d0417
2 mengubah file dengan 9 tambahan dan 9 penghapusan
  1. 6 6
      drivers/thermal/Kconfig
  2. 3 3
      drivers/thermal/Makefile

+ 6 - 6
drivers/thermal/Kconfig

@@ -29,14 +29,14 @@ choice
 
 
 config THERMAL_DEFAULT_GOV_STEP_WISE
 config THERMAL_DEFAULT_GOV_STEP_WISE
 	bool "step_wise"
 	bool "step_wise"
-	select STEP_WISE
+	select THERMAL_GOV_STEP_WISE
 	help
 	help
 	  Use the step_wise governor as default. This throttles the
 	  Use the step_wise governor as default. This throttles the
 	  devices one step at a time.
 	  devices one step at a time.
 
 
 config THERMAL_DEFAULT_GOV_FAIR_SHARE
 config THERMAL_DEFAULT_GOV_FAIR_SHARE
 	bool "fair_share"
 	bool "fair_share"
-	select FAIR_SHARE
+	select THERMAL_GOV_FAIR_SHARE
 	help
 	help
 	  Use the fair_share governor as default. This throttles the
 	  Use the fair_share governor as default. This throttles the
 	  devices based on their 'contribution' to a zone. The
 	  devices based on their 'contribution' to a zone. The
@@ -44,24 +44,24 @@ config THERMAL_DEFAULT_GOV_FAIR_SHARE
 
 
 config THERMAL_DEFAULT_GOV_USER_SPACE
 config THERMAL_DEFAULT_GOV_USER_SPACE
 	bool "user_space"
 	bool "user_space"
-	select USER_SPACE
+	select THERMAL_GOV_USER_SPACE
 	help
 	help
 	  Select this if you want to let the user space manage the
 	  Select this if you want to let the user space manage the
 	  lpatform thermals.
 	  lpatform thermals.
 
 
 endchoice
 endchoice
 
 
-config FAIR_SHARE
+config THERMAL_GOV_FAIR_SHARE
 	bool "Fair-share thermal governor"
 	bool "Fair-share thermal governor"
 	help
 	help
 	  Enable this to manage platform thermals using fair-share governor.
 	  Enable this to manage platform thermals using fair-share governor.
 
 
-config STEP_WISE
+config THERMAL_GOV_STEP_WISE
 	bool "Step_wise thermal governor"
 	bool "Step_wise thermal governor"
 	help
 	help
 	  Enable this to manage platform thermals using a simple linear
 	  Enable this to manage platform thermals using a simple linear
 
 
-config USER_SPACE
+config THERMAL_GOV_USER_SPACE
 	bool "User_space thermal governor"
 	bool "User_space thermal governor"
 	help
 	help
 	  Enable this to let the user space manage the platform thermals.
 	  Enable this to let the user space manage the platform thermals.

+ 3 - 3
drivers/thermal/Makefile

@@ -5,9 +5,9 @@
 obj-$(CONFIG_THERMAL)		+= thermal_sys.o
 obj-$(CONFIG_THERMAL)		+= thermal_sys.o
 
 
 # governors
 # governors
-obj-$(CONFIG_FAIR_SHARE)	+= fair_share.o
-obj-$(CONFIG_STEP_WISE)		+= step_wise.o
-obj-$(CONFIG_USER_SPACE)	+= user_space.o
+obj-$(CONFIG_THERMAL_GOV_FAIR_SHARE)	+= fair_share.o
+obj-$(CONFIG_THERMAL_GOV_STEP_WISE)	+= step_wise.o
+obj-$(CONFIG_THERMAL_GOV_USER_SPACE)	+= user_space.o
 
 
 # cpufreq cooling
 # cpufreq cooling
 obj-$(CONFIG_CPU_THERMAL)	+= cpu_cooling.o
 obj-$(CONFIG_CPU_THERMAL)	+= cpu_cooling.o