Unverified Commit 7e27896e authored by Derek J. Clark's avatar Derek J. Clark Committed by Ilpo Järvinen
Browse files

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: default avatarMark Pearson <mpearson-lenovo@squebb.ca>
Reviewed-by: default avatarRong Zhang <i@rong.moe>
Tested-by: default avatarRong Zhang <i@rong.moe>
Signed-off-by: default avatarDerek J. Clark <derekjohn.clark@gmail.com>
Link: https://patch.msgid.link/20260510042546.436874-8-derekjohn.clark@gmail.com


Reviewed-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
parent e8d5460a

drivers/platform/x86/lenovo/wmi-events.c

+1 −1
Original line number Diff line number Diff line
@@ -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"

drivers/platform/x86/lenovo/wmi-gamezone.c

+0 −1
Original line number Diff line number Diff line
@@ -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"

drivers/platform/x86/lenovo/wmi-gamezone.h

deleted100644 → 0
+0 −20
Original line number Diff line number Diff line 
/* 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_ */

drivers/platform/x86/lenovo/wmi-helpers.h

+13 −0
Original line number Diff line number Diff line
@@ -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);

drivers/platform/x86/lenovo/wmi-other.c

+0 −1
Original line number Diff line number Diff line
@@ -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"