platform/x86: intel-vbtn: Move to intel sub-directory

Move Intel vButton driver to intel sub-directory to improve readability.

Signed-off-by: Kate Hsuan <hpa@redhat.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20210820110458.73018-19-andriy.shevchenko@linux.intel.com
Signed-off-by: Hans de Goede <hdegoede@redhat.com>

diff --git a/MAINTAINERS b/MAINTAINERS
index 5339b210d6a5bd68cf58678dea07392cf7d7667c..4662d4d4db5dc280127d09ebf044d530de082728 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -9571,7 +9571,7 @@ INTEL VIRTUAL BUTTON DRIVER
 M:     AceLan Kao <acelan.kao@canonical.com>
 L:     platform-driver-x86@vger.kernel.org
 S:     Maintained
-F:     drivers/platform/x86/intel-vbtn.c
+F:     drivers/platform/x86/intel/vbtn.c
 
 INTEL WIRELESS 3945ABG/BG, 4965AGN (iwlegacy)
 M:     Stanislaw Gruszka <stf_xl@wp.pl>

diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index 7f54db30cf5addb3f39819d304b766155f9c11b7..f1349a1e17aeb946bffe3de8140ef9d30b972110 100644 (file)
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -668,19 +668,6 @@ config THINKPAD_LMI
 
 source "drivers/platform/x86/intel/Kconfig"
 
-config INTEL_VBTN
-       tristate "INTEL VIRTUAL BUTTON"
-       depends on ACPI
-       depends on INPUT
-       depends on I2C
-       select INPUT_SPARSEKMAP
-       help
-         This driver provides support for the Intel Virtual Button interface.
-         Some laptops require this driver for power button support.
-
-         To compile this driver as a module, choose M here: the module will
-         be called intel_vbtn.
-
 config MSI_LAPTOP
        tristate "MSI Laptop Extras"
        depends on ACPI

diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
index 836fbab61f47b3036fcab1ffd5476f8dbff8cf08..e6e888af9df7979be72385a7aa037ade56466f8c 100644 (file)
--- a/drivers/platform/x86/Makefile
+++ b/drivers/platform/x86/Makefile
@@ -71,8 +71,6 @@ obj-$(CONFIG_THINKPAD_LMI)    += think-lmi.o
 # Intel
 obj-$(CONFIG_X86_PLATFORM_DRIVERS_INTEL)               += intel/
 
-obj-$(CONFIG_INTEL_VBTN)               += intel-vbtn.o
-
 # MSI
 obj-$(CONFIG_MSI_LAPTOP)       += msi-laptop.o
 obj-$(CONFIG_MSI_WMI)          += msi-wmi.o

diff --git a/drivers/platform/x86/intel/Kconfig b/drivers/platform/x86/intel/Kconfig
index 3c7fd0bd39f1add0dca6a2832e154fd65ac62ee8..a5d71d669b8210e3a0dade2c490d41227c9a29ac 100644 (file)
--- a/drivers/platform/x86/intel/Kconfig
+++ b/drivers/platform/x86/intel/Kconfig
@@ -38,6 +38,19 @@ config INTEL_HID_EVENT
          To compile this driver as a module, choose M here: the module will
          be called intel_hid.
 
+config INTEL_VBTN
+       tristate "Intel Virtual Button"
+       depends on ACPI
+       depends on INPUT
+       depends on I2C
+       select INPUT_SPARSEKMAP
+       help
+         This driver provides support for the Intel Virtual Button interface.
+         Some laptops require this driver for power button support.
+
+         To compile this driver as a module, choose M here: the module will
+         be called intel_vbtn.
+
 config INTEL_INT0002_VGPIO
        tristate "Intel ACPI INT0002 Virtual GPIO driver"
        depends on GPIOLIB && ACPI && PM_SLEEP

diff --git a/drivers/platform/x86/intel/Makefile b/drivers/platform/x86/intel/Makefile
index f27d91464cc9dd8dd45fa23d9d201a1eaa8326dd..67b16119e712fcdc014762df949605e68321c68f 100644 (file)
--- a/drivers/platform/x86/intel/Makefile
+++ b/drivers/platform/x86/intel/Makefile
@@ -16,6 +16,8 @@ obj-$(CONFIG_INTEL_TELEMETRY)         += telemetry/
 # Intel input drivers
 intel-hid-y                            := hid.o
 obj-$(CONFIG_INTEL_HID_EVENT)          += intel-hid.o
+intel-vbtn-y                           := vbtn.o
+obj-$(CONFIG_INTEL_VBTN)               += intel-vbtn.o
 
 # Intel miscellaneous drivers
 intel_int0002_vgpio-y                  := int0002_vgpio.o

diff --git a/drivers/platform/x86/intel-vbtn.c b/drivers/platform/x86/intel/vbtn.c
similarity index 99%
rename from drivers/platform/x86/intel-vbtn.c
rename to drivers/platform/x86/intel/vbtn.c
index 30916643106336dec3d716ece7a5208e031f299c..15f013af9e623684034a2c89809b4e61fe6813e2 100644 (file)
--- a/drivers/platform/x86/intel-vbtn.c
+++ b/drivers/platform/x86/intel/vbtn.c
@@ -14,7 +14,7 @@
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/suspend.h>
-#include "dual_accel_detect.h"
+#include "../dual_accel_detect.h"
 
 /* Returned when NOT in tablet mode on some HP Stream x360 11 models */
 #define VGBS_TABLET_MODE_FLAG_ALT      0x10