[RFC,1/2] platform/x86: wmi: Add wmidev_get_acpi_device_uid()

Commit Message

Kurt Borja March 8, 2025, 10:05 p.m. UTC

Add a non-deprecated version of wmi_get_acpi_device_uid().

Signed-off-by: Kurt Borja <[e-mail]>
---
 drivers/platform/x86/wmi.c | 12 +++++++++---
 include/linux/wmi.h        |  2 ++
 2 files changed, 11 insertions(+), 3 deletions(-)

Patch

diff --git a/drivers/platform/x86/wmi.c b/drivers/platform/x86/wmi.c
index e46453750d5f1475eb87342b1c5fd04fe20df335..e5ccea1fba4ffcd1ec96dd03cb3fae1dfc6737ef 100644
--- a/drivers/platform/x86/wmi.c
+++ b/drivers/platform/x86/wmi.c
@@ -636,7 +636,6 @@  EXPORT_SYMBOL_GPL(wmi_has_guid);
  */
 char *wmi_get_acpi_device_uid(const char *guid_string)
 {
-	struct wmi_block *wblock;
 	struct wmi_device *wdev;
 	char *uid;
 
@@ -644,8 +643,7 @@  char *wmi_get_acpi_device_uid(const char *guid_string)
 	if (IS_ERR(wdev))
 		return NULL;
 
-	wblock = container_of(wdev, struct wmi_block, dev);
-	uid = acpi_device_uid(wblock->acpi_device);
+	uid = wmidev_get_acpi_device_uid(wdev);
 
 	wmi_device_put(wdev);
 
@@ -653,6 +651,14 @@  char *wmi_get_acpi_device_uid(const char *guid_string)
 }
 EXPORT_SYMBOL_GPL(wmi_get_acpi_device_uid);
 
+char *wmidev_get_acpi_device_uid(struct wmi_device *wdev)
+{
+	struct wmi_block *wblock = container_of(wdev, struct wmi_block, dev);
+
+	return acpi_device_uid(wblock->acpi_device);
+}
+EXPORT_SYMBOL_GPL(wmidev_get_acpi_device_uid);
+
 /*
  * sysfs interface
  */
diff --git a/include/linux/wmi.h b/include/linux/wmi.h
index 10751c8e5e6a0ad3ac9ae317b6f8ecfb14c9a983..625c52ee125219aaa23cf946333af33ad118aafa 100644
--- a/include/linux/wmi.h
+++ b/include/linux/wmi.h
@@ -46,6 +46,8 @@  extern union acpi_object *wmidev_block_query(struct wmi_device *wdev,
 
 acpi_status wmidev_block_set(struct wmi_device *wdev, u8 instance, const struct acpi_buffer *in);
 
+char *wmidev_get_acpi_device_uid(struct wmi_device *wdev);
+
 u8 wmidev_instance_count(struct wmi_device *wdev);
 
 /**