platform/x86/intel: Remove X86_PLATFORM_DRIVERS_INTEL

BugLink: https://bugs.launchpad.net/bugs/1956305
[ Upstream commit 4f6c131c3c31b9f68470ebd01320d5403d8719bb ]

While introduction of this menu brings a nice view in the configuration tools,
it brought more issues than solves, i.e. it prevents to locate files in the
intel/ subfolder without touching non-related Kconfig dependencies elsewhere.
Drop X86_PLATFORM_DRIVERS_INTEL altogether.

Note, on x86 it's enabled by default and it's quite unlikely anybody wants to
disable all of the modules in this submenu.

Fixes: 8bd836feb6ca ("platform/x86: intel_skl_int3472: Move to intel/ subfolder")
Suggested-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20211222194941.76054-1-andriy.shevchenko@linux.intel.com
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Andrea Righi <andrea.righi@canonical.com>

diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
index 0d046ed70da1767d67bf25d08d15b94a52f15a3f..e99297fdb02264a2744521643f8257e086f669b2 100644 (file)
--- a/drivers/platform/x86/Makefile
+++ b/drivers/platform/x86/Makefile
@@ -68,7 +68,7 @@ obj-$(CONFIG_THINKPAD_ACPI)   += thinkpad_acpi.o
 obj-$(CONFIG_THINKPAD_LMI)     += think-lmi.o
 
 # Intel
-obj-$(CONFIG_X86_PLATFORM_DRIVERS_INTEL)               += intel/
+obj-y                          += intel/
 
 # MSI
 obj-$(CONFIG_MSI_LAPTOP)       += msi-laptop.o

diff --git a/drivers/platform/x86/intel/Kconfig b/drivers/platform/x86/intel/Kconfig
index 0b21468e1bd01f1ccaa42189d21fd2b600d697a6..02e4481b384e49ad7452dfc0c8d6e7a5c0726376 100644 (file)
--- a/drivers/platform/x86/intel/Kconfig
+++ b/drivers/platform/x86/intel/Kconfig
@@ -3,19 +3,6 @@
 # Intel x86 Platform Specific Drivers
 #
 
-menuconfig X86_PLATFORM_DRIVERS_INTEL
-       bool "Intel x86 Platform Specific Device Drivers"
-       default y
-       help
-         Say Y here to get to see options for device drivers for
-         various Intel x86 platforms, including vendor-specific
-         drivers. This option alone does not add any kernel code.
-
-         If you say N, all options in this submenu will be skipped
-         and disabled.
-
-if X86_PLATFORM_DRIVERS_INTEL
-
 source "drivers/platform/x86/intel/atomisp2/Kconfig"
 source "drivers/platform/x86/intel/int1092/Kconfig"
 source "drivers/platform/x86/intel/int33fe/Kconfig"
@@ -167,5 +154,3 @@ config INTEL_UNCORE_FREQ_CONTROL
 
          To compile this driver as a module, choose M here: the module
          will be called intel-uncore-frequency.
-
-endif # X86_PLATFORM_DRIVERS_INTEL