ACPI: x86: use acpi_dev_uid_match() for matching _UID

raagjadav · rafaeljw · commit 45f56711daa8 · 2023-10-24T21:49:27.000+02:00
Convert manual _UID references to use the standard ACPI helper.

Signed-off-by: Raag Jadav &lt;raag.jadav@intel.com&gt;
Reviewed-by: Mika Westerberg &lt;mika.westerberg@linux.intel.com&gt;
Signed-off-by: Rafael J. Wysocki &lt;rafael.j.wysocki@intel.com&gt;
diff --git a/drivers/acpi/x86/utils.c b/drivers/acpi/x86/utils.c
@@ -184,8 +184,7 @@ bool acpi_device_override_status(struct acpi_device *adev, unsigned long long *s
 			if (acpi_match_device_ids(adev, override_status_ids[i].hid))
 				continue;
 
-			if (!adev->pnp.unique_id ||
-			    strcmp(adev->pnp.unique_id, override_status_ids[i].uid))
+			if (!acpi_dev_uid_match(adev, override_status_ids[i].uid))
 				continue;
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -184,8 +184,7 @@ bool acpi_device_override_status(struct acpi_device adev, unsigned long long s`
`184`	`184`	`if (acpi_match_device_ids(adev, override_status_ids[i].hid))`
`185`	`185`	`continue;`
`186`	`186`
`187`		`- if (!adev->pnp.unique_id \|\|`
`188`		`- strcmp(adev->pnp.unique_id, override_status_ids[i].uid))`
	`187`	`+ if (!acpi_dev_uid_match(adev, override_status_ids[i].uid))`
`189`	`188`	`continue;`
`190`	`189`	`}`
`191`	`190`