Re: [PATCH 18/20] Move Intel thermal driver for menlow platform driver to intel/ directory to improve readability.

[Daniel Lezcano]

On 10/08/2021 11:58, Kate Hsuan wrote:


Why not move it into drivers/thermal/intel ?


> Signed-off-by: Kate Hsuan <hpa@xxxxxxxxxx>
> ---
>  drivers/platform/x86/Kconfig                       |  8 --------
>  drivers/platform/x86/Makefile                      |  2 +-
>  drivers/platform/x86/intel/Kconfig                 |  1 +
>  drivers/platform/x86/intel/Makefile                |  2 ++
>  drivers/platform/x86/intel/menlow/Kconfig          | 14 ++++++++++++++
>  drivers/platform/x86/intel/menlow/Makefile         |  6 ++++++
>  .../platform/x86/{ => intel/menlow}/intel_menlow.c |  0
>  7 files changed, 24 insertions(+), 9 deletions(-)
>  create mode 100644 drivers/platform/x86/intel/menlow/Kconfig
>  create mode 100644 drivers/platform/x86/intel/menlow/Makefile
>  rename drivers/platform/x86/{ => intel/menlow}/intel_menlow.c (100%)
> 
> diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
> index b9c0d2d97793..50ded236a841 100644
> --- a/drivers/platform/x86/Kconfig
> +++ b/drivers/platform/x86/Kconfig
> @@ -632,15 +632,7 @@ config THINKPAD_LMI
>  
>  source "drivers/platform/x86/intel/Kconfig"
>  
> -config INTEL_MENLOW
> -	tristate "Thermal Management driver for Intel menlow platform"
> -	depends on ACPI_THERMAL
> -	select THERMAL
> -	help
> -	  ACPI thermal management enhancement driver on
> -	  Intel Menlow platform.
>  
> -	  If unsure, say N.
>  
>  config INTEL_OAKTRAIL
>  	tristate "Intel Oaktrail Platform Extras"
> diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
> index f4c6ced59da1..ea5f5dd3f78a 100644
> --- a/drivers/platform/x86/Makefile
> +++ b/drivers/platform/x86/Makefile
> @@ -67,7 +67,7 @@ obj-$(CONFIG_THINKPAD_LMI)	+= think-lmi.o
>  obj-$(CONFIG_X86_PLATFORM_DRIVERS_INTEL)		+= intel/
>  
>  
> -obj-$(CONFIG_INTEL_MENLOW)		+= intel_menlow.o
> +
>  obj-$(CONFIG_INTEL_OAKTRAIL)		+= intel_oaktrail.o
>  obj-$(CONFIG_INTEL_VBTN)		+= intel-vbtn.o
>  
> diff --git a/drivers/platform/x86/intel/Kconfig b/drivers/platform/x86/intel/Kconfig
> index 4efb5ad3e3e1..59c9b602c784 100644
> --- a/drivers/platform/x86/intel/Kconfig
> +++ b/drivers/platform/x86/intel/Kconfig
> @@ -36,6 +36,7 @@ source "drivers/platform/x86/intel/intel_speed_select_if/Kconfig"
>  source "drivers/platform/x86/intel/turbo_max_3/Kconfig"
>  source "drivers/platform/x86/intel/uncore_freq/Kconfig"
>  source "drivers/platform/x86/intel/int0002/Kconfig"
> +source "drivers/platform/x86/intel/menlow/Kconfig"
>  
>  
>  endif # X86_PLATFORM_DRIVERS_INTEL
> diff --git a/drivers/platform/x86/intel/Makefile b/drivers/platform/x86/intel/Makefile
> index fe5058c3af18..b2326554bd84 100644
> --- a/drivers/platform/x86/intel/Makefile
> +++ b/drivers/platform/x86/intel/Makefile
> @@ -12,6 +12,7 @@ obj-$(CONFIG_INTEL_HID_EVENT)		+= hid/
>  obj-$(CONFIG_INTEL_WMI_SBL_FW_UPDATE)	+= wmi/
>  obj-$(CONFIG_INTEL_WMI_THUNDERBOLT)	+= wmi/
>  obj-$(CONFIG_INTEL_INT0002_VGPIO)	+= int0002/
> +obj-$(CONFIG_INTEL_MENLOW)		+= menlow/
>  
>  
>  # Intel PMIC / PMC / P-Unit devices
> @@ -38,3 +39,4 @@ obj-$(CONFIG_INTEL_SPEED_SELECT_INTERFACE)	+= intel_speed_select_if/
>  obj-$(CONFIG_INTEL_TURBO_MAX_3)			+= turbo_max_3/
>  obj-$(CONFIG_INTEL_UNCORE_FREQ_CONTROL)		+= uncore_freq/
>  
> +
> diff --git a/drivers/platform/x86/intel/menlow/Kconfig b/drivers/platform/x86/intel/menlow/Kconfig
> new file mode 100644
> index 000000000000..b2920d259ff7
> --- /dev/null
> +++ b/drivers/platform/x86/intel/menlow/Kconfig
> @@ -0,0 +1,14 @@
> +# SPDX-License-Identifier: GPL-2.0-only
> +#
> +# Intel x86 Platform Specific Drivers
> +#
> +
> +config INTEL_MENLOW
> +	tristate "Thermal Management driver for Intel menlow platform"
> +	depends on ACPI_THERMAL
> +	select THERMAL
> +	help
> +	  ACPI thermal management enhancement driver on
> +	  Intel Menlow platform.
> +
> +	  If unsure, say N.
> diff --git a/drivers/platform/x86/intel/menlow/Makefile b/drivers/platform/x86/intel/menlow/Makefile
> new file mode 100644
> index 000000000000..0e9fda9bff98
> --- /dev/null
> +++ b/drivers/platform/x86/intel/menlow/Makefile
> @@ -0,0 +1,6 @@
> +# SPDX-License-Identifier: GPL-2.0-only
> +#
> +# Intel x86 Platform Specific Drivers
> +#
> +
> +obj-$(CONFIG_INTEL_MENLOW)		+= intel_menlow.o
> diff --git a/drivers/platform/x86/intel_menlow.c b/drivers/platform/x86/intel/menlow/intel_menlow.c
> similarity index 100%
> rename from drivers/platform/x86/intel_menlow.c
> rename to drivers/platform/x86/intel/menlow/intel_menlow.c
> 


-- 
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs

Follow Linaro:  <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog