Re: [PATCH v3 20/20] platform/x86: intel-wmi-thunderbolt: Move to intel sub-directory

[Hans de Goede]

Hi,

On 8/19/21 5:30 AM, Kate Hsuan wrote:
> Move intel-wmi-thunderbolt to intel sub-directory to improve
> readability.
> 
> Signed-off-by: Kate Hsuan <hpa@xxxxxxxxxx>
> ---
>  drivers/platform/x86/Kconfig                         | 12 ------------
>  drivers/platform/x86/Makefile                        |  2 --
>  drivers/platform/x86/intel/Makefile                  |  1 +
>  drivers/platform/x86/intel/wmi/Kconfig               | 12 ++++++++++++
>  drivers/platform/x86/intel/wmi/Makefile              |  2 ++
>  .../wmi/thunderbolt.c}                               |  0
>  6 files changed, 15 insertions(+), 14 deletions(-)
>  rename drivers/platform/x86/{intel-wmi-thunderbolt.c => intel/wmi/thunderbolt.c} (100%)
> 
> diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
> index 611930985b1d..adecdc0d4748 100644
> --- a/drivers/platform/x86/Kconfig
> +++ b/drivers/platform/x86/Kconfig
> @@ -77,18 +77,6 @@ config UV_SYSFS
>  	  To compile this driver as a module, choose M here: the module will
>  	  be called uv_sysfs.
>  
> -config INTEL_WMI_THUNDERBOLT
> -	tristate "Intel WMI thunderbolt force power driver"
> -	depends on ACPI_WMI
> -	help
> -	  Say Y here if you want to be able to use the WMI interface on select
> -	  systems to force the power control of Intel Thunderbolt controllers.
> -	  This is useful for updating the firmware when devices are not plugged
> -	  into the controller.
> -
> -	  To compile this driver as a module, choose M here: the module will
> -	  be called intel-wmi-thunderbolt.
> -
>  config MXM_WMI
>         tristate "WMI support for MXM Laptop Graphics"
>         depends on ACPI_WMI
> diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
> index 0a6dca068d5a..56cff979428b 100644
> --- a/drivers/platform/x86/Makefile
> +++ b/drivers/platform/x86/Makefile
> @@ -10,8 +10,6 @@ obj-$(CONFIG_WMI_BMOF)		+= wmi-bmof.o
>  
>  # WMI drivers
>  obj-$(CONFIG_HUAWEI_WMI)		+= huawei-wmi.o
> -
> -obj-$(CONFIG_INTEL_WMI_THUNDERBOLT)	+= intel-wmi-thunderbolt.o
>  obj-$(CONFIG_MXM_WMI)			+= mxm-wmi.o
>  obj-$(CONFIG_PEAQ_WMI)			+= peaq-wmi.o
>  obj-$(CONFIG_XIAOMI_WMI)		+= xiaomi-wmi.o
> diff --git a/drivers/platform/x86/intel/Makefile b/drivers/platform/x86/intel/Makefile
> index 0b27be3b9334..2c1bab610499 100644
> --- a/drivers/platform/x86/intel/Makefile
> +++ b/drivers/platform/x86/intel/Makefile
> @@ -50,3 +50,4 @@ obj-$(CONFIG_INTEL_SPEED_SELECT_INTERFACE)	+= speed_select_if/
>  
>  #WMI drivers
>  obj-$(CONFIG_INTEL_WMI_SBL_FW_UPDATE)		+= wmi/
> +obj-$(CONFIG_INTEL_WMI_THUNDERBOLT)		+= wmi/

Here we have the issue of sending "make" twice into the same subdir again.

I've fixed this by adding a CONFIG_INTEL_WMI, similar to how I fixed
the same issue for the atomisp2 drivers.

I have made these changes while merging the series there is no need for
a new version.

Regards,

Hans








> diff --git a/drivers/platform/x86/intel/wmi/Kconfig b/drivers/platform/x86/intel/wmi/Kconfig
> index fc70728e0f1f..0d65fc90f5b1 100644
> --- a/drivers/platform/x86/intel/wmi/Kconfig
> +++ b/drivers/platform/x86/intel/wmi/Kconfig
> @@ -12,3 +12,15 @@ config INTEL_WMI_SBL_FW_UPDATE
>  
>  	  To compile this driver as a module, choose M here: the module will
>  	  be called intel-wmi-sbl-fw-update.
> +
> +config INTEL_WMI_THUNDERBOLT
> +	tristate "Intel WMI thunderbolt force power driver"
> +	depends on ACPI_WMI
> +	help
> +	  Say Y here if you want to be able to use the WMI interface on select
> +	  systems to force the power control of Intel Thunderbolt controllers.
> +	  This is useful for updating the firmware when devices are not plugged
> +	  into the controller.
> +
> +	  To compile this driver as a module, choose M here: the module will
> +	  be called intel-wmi-thunderbolt.
> diff --git a/drivers/platform/x86/intel/wmi/Makefile b/drivers/platform/x86/intel/wmi/Makefile
> index bf1f118b6839..c2d56d25dea0 100644
> --- a/drivers/platform/x86/intel/wmi/Makefile
> +++ b/drivers/platform/x86/intel/wmi/Makefile
> @@ -5,3 +5,5 @@
>  
>  intel-wmi-sbl-fw-update-y				:= sbl-fw-update.o
>  obj-$(CONFIG_INTEL_WMI_SBL_FW_UPDATE)	+= intel-wmi-sbl-fw-update.o
> +intel-wmi-thunderbolt-y					:= thunderbolt.o
> +obj-$(CONFIG_INTEL_WMI_THUNDERBOLT)	+= intel-wmi-thunderbolt.o
> diff --git a/drivers/platform/x86/intel-wmi-thunderbolt.c b/drivers/platform/x86/intel/wmi/thunderbolt.c
> similarity index 100%
> rename from drivers/platform/x86/intel-wmi-thunderbolt.c
> rename to drivers/platform/x86/intel/wmi/thunderbolt.c
>