On Fri, Oct 9, 2020 at 5:11 PM Maximilian Luz <luzmaximilian@xxxxxxxxx> wrote:
>
> Move the Surface 3 WMI driver from platform/x86 to the newly created
> platform/surface directory.
Reviewed-by: Andy Shevchenko <andy.shevchenko@xxxxxxxxx>
> Signed-off-by: Maximilian Luz <luzmaximilian@xxxxxxxxx>
> ---
> drivers/platform/surface/Kconfig | 16 ++++++++++++++++
> drivers/platform/surface/Makefile | 2 ++
> drivers/platform/{x86 => surface}/surface3-wmi.c | 0
> drivers/platform/x86/Kconfig | 12 ------------
> drivers/platform/x86/Makefile | 1 -
> 5 files changed, 18 insertions(+), 13 deletions(-)
> rename drivers/platform/{x86 => surface}/surface3-wmi.c (100%)
>
> diff --git a/drivers/platform/surface/Kconfig b/drivers/platform/surface/Kconfig
> index b67926ece95f..326f7bbf83d7 100644
> --- a/drivers/platform/surface/Kconfig
> +++ b/drivers/platform/surface/Kconfig
> @@ -12,3 +12,19 @@ menuconfig SURFACE_PLATFORMS
> kernel code.
>
> If you say N, all options in this submenu will be skipped and disabled.
> +
> +if SURFACE_PLATFORMS
> +
> +config SURFACE3_WMI
> + tristate "Surface 3 WMI Driver"
> + depends on ACPI_WMI
> + depends on DMI
> + depends on INPUT
> + depends on SPI
> + help
> + Say Y here if you have a Surface 3.
> +
> + To compile this driver as a module, choose M here: the module will
> + be called surface3-wmi.
> +
> +endif # SURFACE_PLATFORMS
> diff --git a/drivers/platform/surface/Makefile b/drivers/platform/surface/Makefile
> index 3700f9e84299..f889d521420f 100644
> --- a/drivers/platform/surface/Makefile
> +++ b/drivers/platform/surface/Makefile
> @@ -3,3 +3,5 @@
> # Makefile for linux/drivers/platform/surface
> # Microsoft Surface Platform-Specific Drivers
> #
> +
> +obj-$(CONFIG_SURFACE3_WMI) += surface3-wmi.o
> diff --git a/drivers/platform/x86/surface3-wmi.c b/drivers/platform/surface/surface3-wmi.c
> similarity index 100%
> rename from drivers/platform/x86/surface3-wmi.c
> rename to drivers/platform/surface/surface3-wmi.c
> diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
> index 0d91d136bc3b..0759913c9846 100644
> --- a/drivers/platform/x86/Kconfig
> +++ b/drivers/platform/x86/Kconfig
> @@ -870,18 +870,6 @@ config INTEL_VBTN
> To compile this driver as a module, choose M here: the module will
> be called intel_vbtn.
>
> -config SURFACE3_WMI
> - tristate "Surface 3 WMI Driver"
> - depends on ACPI_WMI
> - depends on DMI
> - depends on INPUT
> - depends on SPI
> - help
> - Say Y here if you have a Surface 3.
> -
> - To compile this driver as a module, choose M here: the module will
> - be called surface3-wmi.
> -
> config SURFACE_3_BUTTON
> tristate "Power/home/volume buttons driver for Microsoft Surface 3 tablet"
> depends on ACPI && KEYBOARD_GPIO && I2C
> diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
> index 5f823f7eff45..29563a32b3e3 100644
> --- a/drivers/platform/x86/Makefile
> +++ b/drivers/platform/x86/Makefile
> @@ -82,7 +82,6 @@ obj-$(CONFIG_INTEL_OAKTRAIL) += intel_oaktrail.o
> obj-$(CONFIG_INTEL_VBTN) += intel-vbtn.o
>
> # Microsoft
> -obj-$(CONFIG_SURFACE3_WMI) += surface3-wmi.o
> obj-$(CONFIG_SURFACE_3_BUTTON) += surface3_button.o
> obj-$(CONFIG_SURFACE_3_POWER_OPREGION) += surface3_power.o
> obj-$(CONFIG_SURFACE_PRO3_BUTTON) += surfacepro3_button.o
> --
> 2.28.0
>
--
With Best Regards,
Andy Shevchenko
