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

Move Intel Smart Connect driver to intel sub-directory to improve
readability and rename it from intel-smartconnect.c to smartconnect.c.

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-11-andriy.shevchenko@linux.intel.com
Signed-off-by: Hans de Goede <hdegoede@redhat.com>

diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index a78678dede17631272fbdd88bcc1768f64f8241b..7820f4e63d017137409f81a9d1318f3dd6f40c49 100644 (file)
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -1110,20 +1110,6 @@ config INTEL_IPS
          functionality.  If in doubt, say Y here; it will only load on
          supported platforms.
 
-config INTEL_SMARTCONNECT
-        tristate "Intel Smart Connect disabling driver"
-       depends on ACPI
-       help
-         Intel Smart Connect is a technology intended to permit devices to
-         update state by resuming for a short period of time at regular
-         intervals. If a user enables this functionality under Windows and
-         then reboots into Linux, the system may remain configured to resume
-         on suspend. In the absence of any userspace to support it, the system
-         will then remain awake until something triggers another suspend.
-
-         This driver checks to determine whether the device has Intel Smart
-         Connect enabled, and if so disables it.
-
 source "drivers/platform/x86/intel_speed_select_if/Kconfig"
 
 config INTEL_TURBO_MAX_3

diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
index 2d8b2528b0abeff952150e4f8f98b5a351ceaaa1..44f990f7c2c4c5dfccc2220d514ae8f6f489b831 100644 (file)
--- a/drivers/platform/x86/Makefile
+++ b/drivers/platform/x86/Makefile
@@ -120,7 +120,6 @@ obj-$(CONFIG_WIRELESS_HOTKEY)               += wireless-hotkey.o
 
 # Intel uncore drivers
 obj-$(CONFIG_INTEL_IPS)                                += intel_ips.o
-obj-$(CONFIG_INTEL_SMARTCONNECT)               += intel-smartconnect.o
 obj-$(CONFIG_INTEL_SPEED_SELECT_INTERFACE)     += intel_speed_select_if/
 obj-$(CONFIG_INTEL_TURBO_MAX_3)                        += intel_turbo_max_3.o
 obj-$(CONFIG_INTEL_UNCORE_FREQ_CONTROL)                += intel-uncore-frequency.o

diff --git a/drivers/platform/x86/intel/Kconfig b/drivers/platform/x86/intel/Kconfig
index fb1d1175fd0924dd5f45826ecd6377349abd2321..24cd26579d5245e6664b7eaecb6e26b57c3e0839 100644 (file)
--- a/drivers/platform/x86/intel/Kconfig
+++ b/drivers/platform/x86/intel/Kconfig
@@ -73,4 +73,18 @@ config INTEL_RST
          firmware will copy the memory contents back to RAM and resume the OS
          as usual.
 
+config INTEL_SMARTCONNECT
+       tristate "Intel Smart Connect disabling driver"
+       depends on ACPI
+       help
+         Intel Smart Connect is a technology intended to permit devices to
+         update state by resuming for a short period of time at regular
+         intervals. If a user enables this functionality under Windows and
+         then reboots into Linux, the system may remain configured to resume
+         on suspend. In the absence of any userspace to support it, the system
+         will then remain awake until something triggers another suspend.
+
+         This driver checks to determine whether the device has Intel Smart
+         Connect enabled, and if so disables it.
+
 endif # X86_PLATFORM_DRIVERS_INTEL

diff --git a/drivers/platform/x86/intel/Makefile b/drivers/platform/x86/intel/Makefile
index d0ab3202c1ac17077371f856f7263e7c6c0551fa..cefcc92d93f596ea85abfebfb4052e4414a29747 100644 (file)
--- a/drivers/platform/x86/intel/Makefile
+++ b/drivers/platform/x86/intel/Makefile
@@ -24,3 +24,5 @@ obj-$(CONFIG_INTEL_PUNIT_IPC)         += intel_punit_ipc.o
 # Intel Uncore drivers
 intel-rst-y                            := rst.o
 obj-$(CONFIG_INTEL_RST)                        += intel-rst.o
+intel-smartconnect-y                   := smartconnect.o
+obj-$(CONFIG_INTEL_SMARTCONNECT)       += intel-smartconnect.o

diff --git a/drivers/platform/x86/intel-smartconnect.c b/drivers/platform/x86/intel/smartconnect.c
similarity index 100%
rename from drivers/platform/x86/intel-smartconnect.c
rename to drivers/platform/x86/intel/smartconnect.c