cpufreq: Kconfig: Remove architecture specific menu entries

CPUFreq driver's Kconfig entries are added in Kconfig.<arch> files and they are
all included from the main Kconfig file using a menu entry. This creates another
level of (unnecessary) hierarchy within the menuconfig entries.

The problem occurs when there are drivers usable across architectures. Either
their config entry is duplicated in all the supported architectures or is put
into the main Kconfig entry. With the later one, we have menuconfig entries for
drivers at two levels then.

Fix these issues by getting rid of another level of menuconfig hierarchy and
populate all drivers within the main cpufreq menu. To clearly distinguish where
the drivers start from, also add a comment that will appear in menuconfig.

Reported-by: Tang Yuantian <Yuantian.Tang@freescale.com>
Suggested-by: Scott Wood <scottwood@freescale.com>
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

1 files changed, 19 insertions, 31 deletions

diff --git a/drivers/cpufreq/Kconfig b/drivers/cpufreq/Kconfig
index 4de4dfae4ccc..29b2ef5a68b9 100644
--- a/drivers/cpufreq/Kconfig
+++ b/drivers/cpufreq/Kconfig
@@ -182,6 +182,8 @@ config CPU_FREQ_GOV_CONSERVATIVE
 
           If in doubt, say N.
 
+comment "CPU frequency scaling drivers"
+
 config CPUFREQ_DT
         tristate "Generic DT based cpufreq driver"
         depends on HAVE_CLK && OF
@@ -195,19 +197,19 @@ config CPUFREQ_DT
 
           If in doubt, say N.
 
-menu "x86 CPU frequency scaling drivers"
-depends on X86
+if X86
 source "drivers/cpufreq/Kconfig.x86"
-endmenu
+endif
 
-menu "ARM CPU frequency scaling drivers"
-depends on ARM || ARM64
+if ARM || ARM64
 source "drivers/cpufreq/Kconfig.arm"
-endmenu
+endif
 
-menu "AVR32 CPU frequency scaling drivers"
-depends on AVR32
+if PPC32 || PPC64
+source "drivers/cpufreq/Kconfig.powerpc"
+endif
 
+if AVR32
 config AVR32_AT32AP_CPUFREQ
         bool "CPU frequency driver for AT32AP"
         depends on PLATFORM_AT32AP
@@ -215,12 +217,9 @@ config AVR32_AT32AP_CPUFREQ
         help
           This enables the CPU frequency driver for AT32AP processors.
           If in doubt, say N.
+endif
 
-endmenu
-
-menu "CPUFreq processor drivers"
-depends on IA64
-
+if IA64
 config IA64_ACPI_CPUFREQ
         tristate "ACPI Processor P-States driver"
         depends on ACPI_PROCESSOR
@@ -231,12 +230,9 @@ config IA64_ACPI_CPUFREQ
         For details, take a look at <file:Documentation/cpu-freq/>.
 
         If in doubt, say N.
+endif
 
-endmenu
-
-menu "MIPS CPUFreq processor drivers"
-depends on MIPS
-
+if MIPS
 config LOONGSON2_CPUFREQ
         tristate "Loongson2 CPUFreq Driver"
         help
@@ -258,16 +254,9 @@ config LOONGSON1_CPUFREQ
           For details, take a look at <file:Documentation/cpu-freq/>.
 
           If in doubt, say N.
+endif
 
-endmenu
-
-menu "PowerPC CPU frequency scaling drivers"
-depends on PPC32 || PPC64
-source "drivers/cpufreq/Kconfig.powerpc"
-endmenu
-
-menu "SPARC CPU frequency scaling drivers"
-depends on SPARC64
+if SPARC64
 config SPARC_US3_CPUFREQ
         tristate "UltraSPARC-III CPU Frequency driver"
         help
@@ -285,10 +274,9 @@ config SPARC_US2E_CPUFREQ
           For details, take a look at <file:Documentation/cpu-freq>.
 
           If in doubt, say N.
-endmenu
+endif
 
-menu "SH CPU Frequency scaling"
-depends on SUPERH
+if SUPERH
 config SH_CPU_FREQ
         tristate "SuperH CPU Frequency driver"
         help
@@ -302,7 +290,7 @@ config SH_CPU_FREQ
           For details, take a look at <file:Documentation/cpu-freq>.
 
           If unsure, say N.
-endmenu
+endif
 
 endif
 endmenu