[PATCH 01/20] Move Intel hid of pdx86 to intel directory to improve readability.

Kate Hsuan
2021-08-10T09:59:15Z

---
drivers/platform/x86/Kconfig | 12 ------------
drivers/platform/x86/Makefile | 2 +-
drivers/platform/x86/intel/Kconfig | 1 +
drivers/platform/x86/intel/Makefile | 2 ++
drivers/platform/x86/intel/hid/Kconfig | 17 +++++++++++++++++
drivers/platform/x86/intel/hid/Makefile | 7 +++++++
.../platform/x86/{ => intel/hid}/intel-hid.c | 0
7 files changed, 28 insertions(+), 13 deletions(-)
create mode 100644 drivers/platform/x86/intel/hid/Kconfig
create mode 100644 drivers/platform/x86/intel/hid/Makefile
rename drivers/platform/x86/{ => intel/hid}/intel-hid.c (100%)

diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index 38f3e774d5f3..6765f613ce0e 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -653,18 +653,6 @@ config THINKPAD_LMI

source "drivers/platform/x86/intel/Kconfig"

-config INTEL_HID_EVENT
- tristate "INTEL HID Event"
- depends on ACPI
- depends on INPUT
- select INPUT_SPARSEKMAP
- help
- This driver provides support for the Intel HID Event hotkey interface.
- Some laptops require this driver for hotkey support.
-
- To compile this driver as a module, choose M here: the module will
- be called intel_hid.
-
config INTEL_INT0002_VGPIO
tristate "Intel ACPI INT0002 Virtual GPIO driver"
depends on GPIOLIB && ACPI && PM_SLEEP
diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
index f8b475b7a962..328f4bcf99d0 100644
--- a/drivers/platform/x86/Makefile
+++ b/drivers/platform/x86/Makefile
@@ -68,7 +68,7 @@ obj-$(CONFIG_THINKPAD_LMI) += think-lmi.o
# Intel
obj-$(CONFIG_X86_PLATFORM_DRIVERS_INTEL) += intel/

-obj-$(CONFIG_INTEL_HID_EVENT) += intel-hid.o
+
obj-$(CONFIG_INTEL_INT0002_VGPIO) += intel_int0002_vgpio.o
obj-$(CONFIG_INTEL_MENLOW) += intel_menlow.o
obj-$(CONFIG_INTEL_OAKTRAIL) += intel_oaktrail.o
diff --git a/drivers/platform/x86/intel/Kconfig b/drivers/platform/x86/intel/Kconfig
index 161aa19ee863..d2254ab6aad8 100644
--- a/drivers/platform/x86/intel/Kconfig
+++ b/drivers/platform/x86/intel/Kconfig
@@ -19,5 +19,6 @@ if X86_PLATFORM_DRIVERS_INTEL
source "drivers/platform/x86/intel/int33fe/Kconfig"
source "drivers/platform/x86/intel/int3472/Kconfig"
source "drivers/platform/x86/intel/atomisp2/Kconfig"
+source "drivers/platform/x86/intel/hid/Kconfig"

endif # X86_PLATFORM_DRIVERS_INTEL
diff --git a/drivers/platform/x86/intel/Makefile b/drivers/platform/x86/intel/Makefile
index af9442e3d2a9..6f04221456fb 100644
--- a/drivers/platform/x86/intel/Makefile
+++ b/drivers/platform/x86/intel/Makefile
@@ -8,3 +8,5 @@ obj-$(CONFIG_INTEL_CHT_INT33FE) += int33fe/
obj-$(CONFIG_INTEL_SKL_INT3472) += int3472/
obj-$(CONFIG_INTEL_ATOMISP2_LED) += atomisp2/
obj-$(CONFIG_INTEL_ATOMISP2_PM) += atomisp2/
+obj-$(CONFIG_INTEL_HID_EVENT) += hid/
+
diff --git a/drivers/platform/x86/intel/hid/Kconfig b/drivers/platform/x86/intel/hid/Kconfig
new file mode 100644
index 000000000000..daacd698aec4
--- /dev/null
+++ b/drivers/platform/x86/intel/hid/Kconfig
@@ -0,0 +1,17 @@
+# SPDX-License-Identifier: GPL-2.0
+#
+# Makefile for drivers/platform/x86/intel
+# Intel x86 Platform-Specific Drivers
+#
+
+config INTEL_HID_EVENT
+ tristate "INTEL HID Event"
+ depends on ACPI
+ depends on INPUT
+ select INPUT_SPARSEKMAP
+ help
+ This driver provides support for the Intel HID Event hotkey interface.
+ Some laptops require this driver for hotkey support.
+
+ To compile this driver as a module, choose M here: the module will
+ be called intel_hid.
\ No newline at end of file
diff --git a/drivers/platform/x86/intel/hid/Makefile b/drivers/platform/x86/intel/hid/Makefile
new file mode 100644
index 000000000000..9e2e753834d5
--- /dev/null
+++ b/drivers/platform/x86/intel/hid/Makefile
@@ -0,0 +1,7 @@
+# SPDX-License-Identifier: GPL-2.0
+#
+# Makefile for drivers/platform/x86/intel
+# Intel x86 Platform-Specific Drivers
+#
+
+obj-$(CONFIG_INTEL_HID_EVENT) += intel-hid.o
\ No newline at end of file
diff --git a/drivers/platform/x86/intel-hid.c b/drivers/platform/x86/intel/hid/intel-hid.c
similarity index 100%
rename from drivers/platform/x86/intel-hid.c
rename to drivers/platform/x86/intel/hid/intel-hid.c
--
2.31.1