platform/x86: lenovo-wmi-helpers: Move gamezone enums to wmi-helpers

In a later patch in the series the thermal mode enum will be accessed
across three separate drivers (wmi-capdata, wmi-gamezonem and wmi-other).
An additional patch in the series will also add a function prototype that
needs to reference this enum in wmi-helpers.h. To avoid having all these
drivers begin to import each others headers, and to avoid declaring an
opaque enum to hande the second case, move the thermal mode enum to
helpers where it can be safely accessed by everything that needs it from
a single import.

While at it, since the gamezone_events_type enum is the only remaining
item in the header, move that as well and remove the gamezone header
entirely.

Cc: stable@vger.kernel.org
Reviewed-by: Mark Pearson <mpearson-lenovo@squebb.ca>
Reviewed-by: Rong Zhang <i@rong.moe>
Tested-by: Rong Zhang <i@rong.moe>
Signed-off-by: Derek J. Clark <derekjohn.clark@gmail.com>
Link: https://patch.msgid.link/20260510042546.436874-8-derekjohn.clark@gmail.com
Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>

diff --git a/drivers/platform/x86/lenovo/wmi-events.c b/drivers/platform/x86/lenovo/wmi-events.c
index 4a6a2c82413acf24487a554ee23c4a99638861aa..fc25bba68a7c6772522d9724da91a90326fd3eef 100644 (file)
--- a/drivers/platform/x86/lenovo/wmi-events.c
+++ b/drivers/platform/x86/lenovo/wmi-events.c
@@ -17,7 +17,7 @@
 #include <linux/wmi.h>
 
 #include "wmi-events.h"
-#include "wmi-gamezone.h"
+#include "wmi-helpers.h"
 
 #define THERMAL_MODE_EVENT_GUID "D320289E-8FEA-41E0-86F9-911D83151B5F"
 

diff --git a/drivers/platform/x86/lenovo/wmi-gamezone.c b/drivers/platform/x86/lenovo/wmi-gamezone.c
index c28785d25673dfd4b0ad5af58b74ed9ddbcede57..109c0b564a9f6ba3c47c7b643fe9e7b24d47e930 100644 (file)
--- a/drivers/platform/x86/lenovo/wmi-gamezone.c
+++ b/drivers/platform/x86/lenovo/wmi-gamezone.c
@@ -21,7 +21,6 @@
 #include <linux/wmi.h>
 
 #include "wmi-events.h"
-#include "wmi-gamezone.h"
 #include "wmi-helpers.h"
 
 #define LENOVO_GAMEZONE_GUID "887B54E3-DDDC-4B2C-8B88-68A26A8835D0"

diff --git a/drivers/platform/x86/lenovo/wmi-gamezone.h b/drivers/platform/x86/lenovo/wmi-gamezone.h
deleted file mode 100644 (file)
index 6b163a5..0000000
--- a/drivers/platform/x86/lenovo/wmi-gamezone.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-
-/* Copyright (C) 2025 Derek J. Clark <derekjohn.clark@gmail.com> */
-
-#ifndef _LENOVO_WMI_GAMEZONE_H_
-#define _LENOVO_WMI_GAMEZONE_H_
-
-enum gamezone_events_type {
-       LWMI_GZ_GET_THERMAL_MODE = 1,
-};
-
-enum thermal_mode {
-       LWMI_GZ_THERMAL_MODE_QUIET =       0x01,
-       LWMI_GZ_THERMAL_MODE_BALANCED =    0x02,
-       LWMI_GZ_THERMAL_MODE_PERFORMANCE = 0x03,
-       LWMI_GZ_THERMAL_MODE_EXTREME =     0xE0, /* Ver 6+ */
-       LWMI_GZ_THERMAL_MODE_CUSTOM =      0xFF,
-};
-
-#endif /* !_LENOVO_WMI_GAMEZONE_H_ */

diff --git a/drivers/platform/x86/lenovo/wmi-helpers.h b/drivers/platform/x86/lenovo/wmi-helpers.h
index 651a039228ed90159578d0370c4eb463b99bf678..ed7db3ebba6cc1fefa6a2ced81c0db29558871e2 100644 (file)
--- a/drivers/platform/x86/lenovo/wmi-helpers.h
+++ b/drivers/platform/x86/lenovo/wmi-helpers.h
@@ -16,6 +16,19 @@ struct wmi_method_args_32 {
        u32 arg1;
 };
 
+enum lwmi_event_type {
+       LWMI_GZ_GET_THERMAL_MODE = 0x01,
+};
+
+enum thermal_mode {
+       LWMI_GZ_THERMAL_MODE_NONE =        0x00,
+       LWMI_GZ_THERMAL_MODE_QUIET =       0x01,
+       LWMI_GZ_THERMAL_MODE_BALANCED =    0x02,
+       LWMI_GZ_THERMAL_MODE_PERFORMANCE = 0x03,
+       LWMI_GZ_THERMAL_MODE_EXTREME =     0xE0, /* Ver 6+ */
+       LWMI_GZ_THERMAL_MODE_CUSTOM =      0xFF,
+};
+
 int lwmi_dev_evaluate_int(struct wmi_device *wdev, u8 instance, u32 method_id,
                          unsigned char *buf, size_t size, u32 *retval);
 

diff --git a/drivers/platform/x86/lenovo/wmi-other.c b/drivers/platform/x86/lenovo/wmi-other.c
index 292fed8bcc807be7c6e114d1eba98bd95a3cce6f..19f48aeda22844806ffe7a79a71a680201444b7c 100644 (file)
--- a/drivers/platform/x86/lenovo/wmi-other.c
+++ b/drivers/platform/x86/lenovo/wmi-other.c
@@ -46,7 +46,6 @@
 
 #include "wmi-capdata.h"
 #include "wmi-events.h"
-#include "wmi-gamezone.h"
 #include "wmi-helpers.h"
 #include "../firmware_attributes_class.h"