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: [PATCH 2/2] platform/x86: dell-sysman: Improve instance detection
Date:   Sun, 30 Apr 2023 22:31:53 +0200
Message-Id: <20230430203153.5587-3-W_Armin@gmx.de>
In-Reply-To: <20230430203153.5587-1-W_Armin@gmx.de>
References: <20230430203153.5587-1-W_Armin@gmx.de>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
UI-OutboundReport: notjunk:1;M01:P0:flWVw255Rho=;ocnIOdG05yZ4JIgUC1FC1PPaiIi
 yDNshtyeph1fXo3vCfA1VO0BLLlsypYWdYgrYPlNUtR+x3kl1dIiU2zgCy3WFjJk2vBW355o7
 /lD4ZMrOIl/Tj9N5w538Un06g375fk89Wsi23i02zDCaJ02EdChe87OzSVPFr1ER9D4+bmgc1
 oUV3HTTSHTEuJwrmBKUCTyyZ7hmAtehRqOtLJG/1nE8OeqblpUdRiczM52utVK+GSgVkaeqMX
 Kyy52k+6sChGjldbztS2t80DYCfPrNbDzSAX9F6k5PaPWO3ThXQF3CRKZ2aAPm45oZRe78nfq
 2mriSfVm2RnkQrAo284DsBN7Q+BIu8swgPPqpBT2CDTk+0uQBrMS0ZqIuGJP42h3Mh4+hp5hb
 vR5BkdVVySZZh/C8g8JiEZRKhFK+K2xJkFqKeCCoBByKUx+GzJxZ940zkrhFuUWejepgj3VGI
 JNWEvM0bpDAneMfSWEAALmEwszjcOECUgC/7MjnnA3OSJ0HGhi+3gsZnIYYoi9Cde/TlDVNN9
 YxBPRCcBVXbONRIbuCxyyw0Mxknz+RR4P3JA2hvKblW0hR1nbiFmTy/aCO0i92nT1Kq0DN5K3
 8MPr2oQ72C3szHUf06bVFIfxDHP3xsogJSIQ3DvxfBvRXokwLNpMrWU5YJ7z2peWuohsuwhKK
 IuePyb3bAo1Ae2sT6dGiJlL7nawfoZ2Y3aMPpRJ8frjQDRWJfPk0LsJEytBmV8KKJvsXbQ3Fb
 ZqF31h/lpERyNzlBgbAq9gP511Iw0cw14+NBeT+k/cXqbZtrEsbw0cf6OWfbl91Lbf0+5A+z2
 zovcX9pO4pjxhaY8gkrA4HtcvhDF5gSis/F8BN28Y3GHPoGh0y/C+pjeibs0hfomBRSI1SE/6
 gFqENXFT5Atcp9u34n/duA0FlhEHoMV0N3XbqRE/bAR1zlC7fCgR2kMbygYNseaVuBgWJzQcO
 hF6HZp/uwoR+6jGLzgFnQsTt3MM=
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--
 drivers/platform/x86/dell/dell-wmi-sysman/sysman.c | 13 +++++--------
 1 file changed, 5 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..b68dd11cb892 100644
=2D-- a/drivers/platform/x86/dell/dell-wmi-sysman/sysman.c
+++ b/drivers/platform/x86/dell/dell-wmi-sysman/sysman.c
@@ -303,16 +303,13 @@ 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;
+	int ret;

-	do {
-		kfree(wmi_obj);
-		wmi_obj =3D get_wmiobj_pointer(i, guid_string);
-		i++;
-	} while (wmi_obj);
+	ret =3D wmi_instance_count(guid_string);
+	if (ret < 0)
+		return 0;

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

 /**
=2D-
2.30.2