Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Armin Wolf <W_Armin@gmx.de>
To:     hdegoede@redhat.com, markgross@kernel.org
Cc:     Mario.Limonciello@amd.com, prasanth.ksr@dell.com,
        jorgealtxwork@gmail.com, james@equiv.tech,
        Dell.Client.Kernel@dell.com, platform-driver-x86@vger.kernel.org,
        linux-kernel@vger.kernel.org
Subject: [RFC v2 2/2] platform/x86: dell-sysman: Improve instance detection
Date:   Wed, 26 Apr 2023 23:28:48 +0200
Message-Id: <20230426212848.108562-3-W_Armin@gmx.de>
In-Reply-To: <20230426212848.108562-1-W_Armin@gmx.de>
References: <20230426212848.108562-1-W_Armin@gmx.de>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
UI-OutboundReport: notjunk:1;M01:P0:4WrzT+kCZLc=;Zm4Bc+b3jJ7UNVRFioct9plRVwW
 AYTxMsls5fv6z3TZtoXb1KxsT2tNgbfmomBM1/URerzpJyeXakKPIp/CSaVPv73Lhk/qQyhlK
 sCwa4PZSCgXcIG0RNRjUyEotzMmSMiCcIoA8xGK1x6ohO98iTZdPLECA4PCx8vDVjC2esxFuC
 RHmpyslZ1dzPNAt792vZNFoj6veo6rBjXHNuPCnMON5tSqbjIh5yi+rgHObZqZsB249WzCmSN
 SWbidxPpCrUTcI/MdEIShmm48HZ3VGyx0ZxGh/yT6sbwoRUn/OK/OF8bWbVay4KIAkrTz8GsU
 V/TBRzNYUyjN9NGIImdWJ2kPi5rZ8QjZi/lTuPpC/I1g1ZJmxSrvek0FySXQC5WeUQXqjFi1G
 ZZr1MU3e0YPnQBxVRhAukhQ1seDytMLmFfZ/sXZreH6B3ivnwS+LCCN7ryqmo0bigZ7OL1tMo
 4eCn/N7icV3StPkbRcWyiW7DLuOmqP3hf4znkXA2v/ibskZU0WictMtQEb3jd5nKln9yUQkkd
 1vb0oN7ZWUFcKW8NMPvp+gMa6SC79tH/oaKtVsO5TtyClhtfTbWPKS5AkKt2eAfwOlHqFu08k
 KFUOcuuNWg6PewDfvOgNvsvJssK/QI0juLQIjU5DC9+WzU2fub0nVy9pjxGxxoOpDBA7a5Rxc
 /aLAWgdkRvcFmcbnPFCGVqx6bOh171Tmx5Nxkn5lLP7m0GcQ6wfi2mxMg8//9xz9mAg3OpX/l
 shAqeuxnso7LUW3Z9zbQrR6V0zxButViQBawlDjDJ8IyLFByNdAfDRWeudHEiTQui0FFgn/Dl
 CundCw+74NpR0eGOeuMSzlrPOYEGGDmD62Fn+au3gGslRMkilDNKhxdgoi2TWbXd4oNb1xbXC
 eyr3OecMk2ciGFRvi0P0t7W/4wUf2Sx0wPIDP/Zb2lJYyr+MpmDzwRXhKzoJfoOFqwpaILheP
 +m/pOPgVkBLzOoCiu6QA2PF5ueM=
Precedence: bulk

The WMI driver core already knows how many WMI object instances
are available, use this information instead of probing the WMI object
manually.

Compile-tested only.

Signed-off-by: Armin Wolf <W_Armin@gmx.de>
=2D--
 .../platform/x86/dell/dell-wmi-sysman/sysman.c    | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/drivers/platform/x86/dell/dell-wmi-sysman/sysman.c b/drivers/=
platform/x86/dell/dell-wmi-sysman/sysman.c
index 0285b47d99d1..526d60b510bb 100644
=2D-- a/drivers/platform/x86/dell/dell-wmi-sysman/sysman.c
+++ b/drivers/platform/x86/dell/dell-wmi-sysman/sysman.c
@@ -7,6 +7,7 @@

 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

+#include <linux/acpi.h>
 #include <linux/fs.h>
 #include <linux/dmi.h>
 #include <linux/module.h>
@@ -303,16 +304,14 @@ union acpi_object *get_wmiobj_pointer(int instance_i=
d, const char *guid_string)
  */
 int get_instance_count(const char *guid_string)
 {
-	union acpi_object *wmi_obj =3D NULL;
-	int i =3D 0;
+	acpi_status status;
+	u8 instance_count;

-	do {
-		kfree(wmi_obj);
-		wmi_obj =3D get_wmiobj_pointer(i, guid_string);
-		i++;
-	} while (wmi_obj);
+	status =3D wmi_instance_count(guid_string, &instance_count);
+	if (ACPI_FAILURE(status))
+		return 0;

-	return (i-1);
+	return instance_count;
 }

 /**
=2D-
2.30.2