[PATCH v1 1/1] platform/x86/intel: Remove X86_PLATFORM_DRIVERS_INTEL

[PATCH v1 1/1] platform/x86/intel: Remove X86_PLATFORM_DRIVERS_INTEL

[Andy Shevchenko]

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>
---
 drivers/platform/x86/Makefile      |  2 +-
 drivers/platform/x86/intel/Kconfig | 15 ---------------
 2 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
index dfb7ca88f012..18b11769073b 100644
--- a/drivers/platform/x86/Makefile
+++ b/drivers/platform/x86/Makefile
@@ -69,7 +69,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 e0cc64dcf72c..f8b53f24f6f2 100644
--- 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"
@@ -195,5 +182,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
-- 
2.34.1

Re: [PATCH v1 1/1] platform/x86/intel: Remove X86_PLATFORM_DRIVERS_INTEL

[Hans de Goede]

Hi,

On 12/22/21 20:49, Andy Shevchenko wrote:
> 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>

Thank you for your patch, I've applied this patch to my review-hans 
branch:
https://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git/log/?h=review-hans

Note it will show up in my review-hans branch once I've pushed my
local branch there, which might take a while.

Once I've run some tests on this branch the patches there will be
added to the platform-drivers-x86/for-next branch and eventually
will be included in the pdx86 pull-request to Linus for the next
merge-window.

Regards,

Hans


> ---
>  drivers/platform/x86/Makefile      |  2 +-
>  drivers/platform/x86/intel/Kconfig | 15 ---------------
>  2 files changed, 1 insertion(+), 16 deletions(-)
> 
> diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
> index dfb7ca88f012..18b11769073b 100644
> --- a/drivers/platform/x86/Makefile
> +++ b/drivers/platform/x86/Makefile
> @@ -69,7 +69,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 e0cc64dcf72c..f8b53f24f6f2 100644
> --- 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"
> @@ -195,5 +182,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
>