Refactor drivers/thermal/Kconfig

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

diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
index 266c15eb89ea747a80b03805cb69cd672aaa30e7..937a23da66e57c1431d77b595ea83f7f11fb9cee 100644 (file)
--- a/drivers/thermal/Kconfig
+++ b/drivers/thermal/Kconfig
@@ -13,15 +13,62 @@ menuconfig THERMAL
          All platforms with ACPI thermal support can use this driver.
          If you want this support, you should say Y or M here.
 
+if THERMAL
+
 config THERMAL_HWMON
        bool
-       depends on THERMAL
        depends on HWMON=y || HWMON=THERMAL
        default y
 
+choice
+       prompt "Default Thermal governor"
+       default THERMAL_DEFAULT_GOV_STEP_WISE
+       help
+         This option sets which thermal governor shall be loaded at
+         startup. If in doubt, select 'step_wise'.
+
+config THERMAL_DEFAULT_GOV_STEP_WISE
+       bool "step_wise"
+       select STEP_WISE
+       help
+         Use the step_wise governor as default. This throttles the
+         devices one step at a time.
+
+config THERMAL_DEFAULT_GOV_FAIR_SHARE
+       bool "fair_share"
+       select FAIR_SHARE
+       help
+         Use the fair_share governor as default. This throttles the
+         devices based on their 'contribution' to a zone. The
+         contribution should be provided through platform data.
+
+config THERMAL_DEFAULT_GOV_USER_SPACE
+       bool "user_space"
+       select USER_SPACE
+       help
+         Select this if you want to let the user space manage the
+         lpatform thermals.
+
+endchoice
+
+config FAIR_SHARE
+       bool "Fair-share thermal governor"
+       help
+         Enable this to manage platform thermals using fair-share governor.
+
+config STEP_WISE
+       bool "Step_wise thermal governor"
+       help
+         Enable this to manage platform thermals using a simple linear
+
+config USER_SPACE
+       bool "User_space thermal governor"
+       help
+         Enable this to let the user space manage the platform thermals.
+
 config CPU_THERMAL
        bool "generic cpu cooling support"
-       depends on THERMAL && CPU_FREQ
+       depends on CPU_FREQ
        select CPU_FREQ_TABLE
        help
          This implements the generic cpu cooling mechanism through frequency
@@ -33,7 +80,6 @@ config CPU_THERMAL
 
 config SPEAR_THERMAL
        bool "SPEAr thermal sensor driver"
-       depends on THERMAL
        depends on PLAT_SPEAR
        depends on OF
        help
@@ -42,7 +88,6 @@ config SPEAR_THERMAL
 
 config RCAR_THERMAL
        tristate "Renesas R-Car thermal driver"
-       depends on THERMAL
        depends on ARCH_SHMOBILE
        help
          Enable this to plug the R-Car thermal sensor driver into the Linux
@@ -50,57 +95,11 @@ config RCAR_THERMAL
 
 config EXYNOS_THERMAL
        tristate "Temperature sensor on Samsung EXYNOS"
-       depends on (ARCH_EXYNOS4 || ARCH_EXYNOS5) && THERMAL
+       depends on (ARCH_EXYNOS4 || ARCH_EXYNOS5)
        select CPU_FREQ_TABLE
        help
          If you say yes here you get support for TMU (Thermal Managment
          Unit) on SAMSUNG EXYNOS series of SoC.
 
-config FAIR_SHARE
-       bool "Fair-share thermal governor"
-       depends on THERMAL
-       help
-         Enable this to manage platform thermals using fair-share governor.
-
-config STEP_WISE
-       bool "Step_wise thermal governor"
-       depends on THERMAL
-       help
-         Enable this to manage platform thermals using a simple linear
-
-config USER_SPACE
-       bool "User_space thermal governor"
-       depends on THERMAL
-       help
-         Enable this to let the user space manage the platform thermals.
-
-choice
-       prompt "Default Thermal governor"
-       depends on THERMAL
-       default THERMAL_DEFAULT_GOV_STEP_WISE
-       help
-         This option sets which thermal governor shall be loaded at
-         startup. If in doubt, select 'step_wise'.
-
-config THERMAL_DEFAULT_GOV_STEP_WISE
-       bool "step_wise"
-       select STEP_WISE
-       help
-         Use the step_wise governor as default. This throttles the
-         devices one step at a time.
-
-config THERMAL_DEFAULT_GOV_FAIR_SHARE
-       bool "fair_share"
-       select FAIR_SHARE
-       help
-         Use the fair_share governor as default. This throttles the
-         devices based on their 'contribution' to a zone. The
-         contribution should be provided through platform data.
 
-config THERMAL_DEFAULT_GOV_USER_SPACE
-       bool "user_space"
-       select USER_SPACE
-       help
-         Select this if you want to let the user space manage the
-         platform thermals.
-endchoice
+endif