From nobody Thu Apr 2 21:49:47 2026 Received: from mail-dy1-f171.google.com (mail-dy1-f171.google.com [74.125.82.171]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B7DF636074D for ; Thu, 2 Apr 2026 03:24:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775100275; cv=none; b=kH3aWuSAC8S754jDtyKNccSGdsB1xzF3QF2AMPbflWhlh2skuE9noqaHCBrTZgjmt1ob4m22TGVb62wGVdQ/vaI38kAwLmu4GBwkQOq9+1hxJqdLT+ONVwiCCx5p4FbezY9rQYOurU0gSW1j+Fjm7I/NwMY9VP6wU5Tdhk0RRc0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775100275; c=relaxed/simple; bh=p2FW/7Co4gTuIHeXkZjiYHRP3A6bMG+GAgvWuoH8jxY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=YnD2+vhSX7gLH46UTxsUrb6/bp0997yYxnR0mgXOkWAHUUZyuHatsKI2hnpPZYTVWyM0C44suLE4t4aSsJZANJjGMZ6/KqjIuXOWao5yZB/badI7QLfoK2d3RR8bxkRF5uEVkrKe5X71pAZ0o8x0iYaGezMGLxNldF6w5cImLBs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=fmsSY2+c; arc=none smtp.client-ip=74.125.82.171 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="fmsSY2+c" Received: by mail-dy1-f171.google.com with SMTP id 5a478bee46e88-2bd9a485bd6so1038898eec.1 for ; Wed, 01 Apr 2026 20:24:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1775100273; x=1775705073; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=7z92RBuaPY9HUNloJ1nuQ1a3FjYPlCzVXIVhYHp9tSk=; b=fmsSY2+cnrZCab5MiEqSx/pmaSvf8AiLC40PGKoToGmL9pWa1RLkqQoTKBsE8bbse1 JY0OohhFYQ/f8sTRJloibtD+m0inMFBCovbj++uyt90JD3ujIbZpWXWQo2+BQPHg6dCI Cn4dZEGijAMreggLfk3dndul8dCCfh3e7mLSPMNfXyYqO7+f8YCpPW62POl7CvAk2zKe dKCF5ptZOZpvEdHsc3ZngaeeUjIp91PY5Tbo55Y0gPXD8dwGrUUzKgD6lrq8KLHeroDX viHv+EB6EbNEre6regjfNYSDz+nPOjqKSp+yV43fGA0CcjkdxHhbilOQtr/CfHepOHQJ i7QQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775100273; x=1775705073; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=7z92RBuaPY9HUNloJ1nuQ1a3FjYPlCzVXIVhYHp9tSk=; b=JJRAeeUpaMBjSGsg7p3pS2mOYT/4I8nrtpZ4wrjHjdu+CNg+8GoVGJaJokpwNMLPY1 kZjXrb6JKHgbKBorNasJFxiKDxgqI3VWf/8dOQ6VDxMbu1I+ZYdUIsUMPdwfXJ8U0EEg pB+h71bCObqnq462q0E1npbXu76kpEnpX/nclTj6S+rDMXLTOLAnmo2xPngTbFhbXfWt jALAfzZEl389OW559JFwfv/cnHZ/MQQTKvHGT91JWy/RlS1seLP+DfJHL9nYBnpE5aMh UD0f5PUqYPs40yommulJMQNO1UCOSlR00gDA87QavgBB1Uzj36AHNgOfn0xNCU6XRQL4 idOQ== X-Forwarded-Encrypted: i=1; AJvYcCUXUi1tF3R+vLWPaqp+TT7Ed6CCSHj/Pwm9KggBg2mpD7fpOMBBGWhFEjgP/3PgZV/laKBeCbmczqMInY8=@vger.kernel.org X-Gm-Message-State: AOJu0YzqwoSrDgxYapSU+brLRTe9B2oz2uGbC98v1suaTTa3NylEssb1 IdQTpiieUd9EGmtuSYe0+fG3/KD7UHU8WlKvV1lsEmYocvuYeJI/ZF+1 X-Gm-Gg: ATEYQzzoMFA70s9AUsp4ZtT/GIiQYb0+EOlwQaSGPk4YCGp/aiI4FMBGw+wrbcvHE33 KUukyPEVgOH49YzTU3T64RcaaZWoO9Ec6PEfJ2dh9lZLTxWiQEbPr+yqmY5uNH9RRz5WMc+InQ0 L4VZKDLTuX8LCl8EIERdnZ2GLMYl9mWqRiqQzVRTS/+UAMEUmbTNG036LjDk0x5yuE9GvuMynb5 iXBg3DdTIGGpeHl4FPYSzPXUtCvxnXNSxZ4SSUFWeEu3xLIkbev3viUlXSXnCcYEkGaPfIRAy49 BdDket/cglm+A3ZJlmfpBkeExab0xhGKENVhkSmAFER5s2ETmlVHsDR8e8We8ojcXwA0IKJbRa7 /CbUeI9+PDhg34vQOVJ0UYpUhBBgtzbppDOzlTIqlPsXneDl+sGFqhQVyCS6p5jT8XEmmjObGht 3oTp4XCxjYJp6kdmwE2C3ElEY2A5+Amwhbmr5pYmfKMAXo0iNJZPRSySMLAK3l5x2/8UKC8gFmv ks8 X-Received: by 2002:a05:7300:2211:b0:2c1:5b23:1752 with SMTP id 5a478bee46e88-2c932bb1657mr3343404eec.23.1775100272848; Wed, 01 Apr 2026 20:24:32 -0700 (PDT) Received: from lappy (108-228-232-20.lightspeed.sndgca.sbcglobal.net. [108.228.232.20]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-2ca7cae9e9esm1265981eec.23.2026.04.01.20.24.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Apr 2026 20:24:32 -0700 (PDT) From: "Derek J. Clark" To: =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= , Hans de Goede Cc: Mark Pearson , Armin Wolf , Jonathan Corbet , Rong Zhang , Kurt Borja , "Derek J . Clark" , platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v7 08/16] platform/x86: lenovo-wmi-helpers: Move gamezone enums to wmi-helpers Date: Thu, 2 Apr 2026 03:24:16 +0000 Message-ID: <20260402032424.678528-9-derekjohn.clark@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260402032424.678528-1-derekjohn.clark@gmail.com> References: <20260402032424.678528-1-derekjohn.clark@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 protoype 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. Reviewed-by: Rong Zhang Tested-by: Rong Zhang Signed-off-by: Derek J. Clark --- drivers/platform/x86/lenovo/wmi-events.c | 2 +- drivers/platform/x86/lenovo/wmi-gamezone.c | 1 - drivers/platform/x86/lenovo/wmi-gamezone.h | 21 --------------------- drivers/platform/x86/lenovo/wmi-helpers.h | 13 +++++++++++++ drivers/platform/x86/lenovo/wmi-other.c | 3 +-- 5 files changed, 15 insertions(+), 25 deletions(-) delete mode 100644 drivers/platform/x86/lenovo/wmi-gamezone.h diff --git a/drivers/platform/x86/lenovo/wmi-events.c b/drivers/platform/x8= 6/lenovo/wmi-events.c index 0994cd7dd504..9e9f2e82e04d 100644 --- a/drivers/platform/x86/lenovo/wmi-events.c +++ b/drivers/platform/x86/lenovo/wmi-events.c @@ -17,7 +17,7 @@ #include =20 #include "wmi-events.h" -#include "wmi-gamezone.h" +#include "wmi-helpers.h" =20 #define THERMAL_MODE_EVENT_GUID "D320289E-8FEA-41E0-86F9-911D83151B5F" =20 diff --git a/drivers/platform/x86/lenovo/wmi-gamezone.c b/drivers/platform/= x86/lenovo/wmi-gamezone.c index a91089694727..5a8f4aee02cf 100644 --- a/drivers/platform/x86/lenovo/wmi-gamezone.c +++ b/drivers/platform/x86/lenovo/wmi-gamezone.c @@ -21,7 +21,6 @@ #include =20 #include "wmi-events.h" -#include "wmi-gamezone.h" #include "wmi-helpers.h" =20 #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 index ddb919cf6c36..000000000000 --- a/drivers/platform/x86/lenovo/wmi-gamezone.h +++ /dev/null @@ -1,21 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later */ - -/* Copyright (C) 2025 Derek J. Clark */ - -#ifndef _LENOVO_WMI_GAMEZONE_H_ -#define _LENOVO_WMI_GAMEZONE_H_ - -enum gamezone_events_type { - LWMI_GZ_GET_THERMAL_MODE =3D 1, -}; - -enum thermal_mode { - LWMI_GZ_THERMAL_MODE_NONE =3D 0x00, - LWMI_GZ_THERMAL_MODE_QUIET =3D 0x01, - LWMI_GZ_THERMAL_MODE_BALANCED =3D 0x02, - LWMI_GZ_THERMAL_MODE_PERFORMANCE =3D 0x03, - LWMI_GZ_THERMAL_MODE_EXTREME =3D 0xE0, /* Ver 6+ */ - LWMI_GZ_THERMAL_MODE_CUSTOM =3D 0xFF, -}; - -#endif /* !_LENOVO_WMI_GAMEZONE_H_ */ diff --git a/drivers/platform/x86/lenovo/wmi-helpers.h b/drivers/platform/x= 86/lenovo/wmi-helpers.h index 651a039228ed..ed7db3ebba6c 100644 --- 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; }; =20 +enum lwmi_event_type { + LWMI_GZ_GET_THERMAL_MODE =3D 0x01, +}; + +enum thermal_mode { + LWMI_GZ_THERMAL_MODE_NONE =3D 0x00, + LWMI_GZ_THERMAL_MODE_QUIET =3D 0x01, + LWMI_GZ_THERMAL_MODE_BALANCED =3D 0x02, + LWMI_GZ_THERMAL_MODE_PERFORMANCE =3D 0x03, + LWMI_GZ_THERMAL_MODE_EXTREME =3D 0xE0, /* Ver 6+ */ + LWMI_GZ_THERMAL_MODE_CUSTOM =3D 0xFF, +}; + int lwmi_dev_evaluate_int(struct wmi_device *wdev, u8 instance, u32 method= _id, unsigned char *buf, size_t size, u32 *retval); =20 diff --git a/drivers/platform/x86/lenovo/wmi-other.c b/drivers/platform/x86= /lenovo/wmi-other.c index 1d1bab98298b..e475d1d8a5a7 100644 --- a/drivers/platform/x86/lenovo/wmi-other.c +++ b/drivers/platform/x86/lenovo/wmi-other.c @@ -46,7 +46,6 @@ =20 #include "wmi-capdata.h" #include "wmi-events.h" -#include "wmi-gamezone.h" #include "wmi-helpers.h" #include "../firmware_attributes_class.h" =20 @@ -787,7 +786,7 @@ static bool lwmi_attr_01_is_supported(struct tunable_at= tr_01 *tunable_attr) { u8 modes[2] =3D { LWMI_GZ_THERMAL_MODE_CUSTOM, LWMI_GZ_THERMAL_MODE_NONE = }; struct lwmi_om_priv *priv =3D dev_get_drvdata(tunable_attr->dev); - struct wmi_method_args_32 args =3D { 0x0, 0x0 }; + struct wmi_method_args_32 args =3D {}; bool cd_mode_found =3D false; bool cv_mode_found =3D false; struct capdata01 capdata; --=20 2.53.0