From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Thu, 4 Jan 2024 11:57:48 +0000 (+0100)
Subject: Merge branch 'acpi-utils'
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=f00571b58ec213ec818392301101a244e6f97989;p=linux.git

Merge branch 'acpi-utils'

Merge ACPI utility functions updates for 6.8-rc1:

 - Modify acpi_dev_uid_match() to support different types of its second
   argument and adjust its users accordingly (Raag Jadav).

 - Clean up code related to acpi_evaluate_reference() and ACPI device
   lists (Rafael J. Wysocki).

* acpi-utils:
  ACPI: utils: Introduce helper for _DEP list lookup
  ACPI: utils: Fix white space in struct acpi_handle_list definition
  ACPI: utils: Refine acpi_handle_list_equal() slightly
  ACPI: utils: Return bool from acpi_evaluate_reference()
  ACPI: utils: Rearrange in acpi_evaluate_reference()
  perf: arm_cspmu: drop redundant acpi_dev_uid_to_integer()
  efi: dev-path-parser: use acpi_dev_uid_match() for matching _UID
  ACPI: LPSS: use acpi_dev_uid_match() for matching _UID
  ACPI: bus: update acpi_dev_hid_uid_match() to support multiple types
  ACPI: bus: update acpi_dev_uid_match() to support multiple types
---

f00571b58ec213ec818392301101a244e6f97989
diff --cc drivers/acpi/scan.c
index c6115ea265cf0,7b731958af5e9..950d3b02a2a94
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@@ -1981,10 -1981,9 +1981,9 @@@ static void acpi_scan_init_hotplug(stru
  	}
  }
  
 -static u32 acpi_scan_check_dep(acpi_handle handle, bool check_dep)
 +static u32 acpi_scan_check_dep(acpi_handle handle)
  {
  	struct acpi_handle_list dep_devices;
- 	acpi_status status;
  	u32 count;
  	int i;
  
@@@ -1994,11 -1993,11 +1993,10 @@@
  	 * 2. ACPI nodes describing USB ports.
  	 * Still, checking for _HID catches more then just these cases ...
  	 */
 -	if (!check_dep || !acpi_has_method(handle, "_DEP") ||
 -	    !acpi_has_method(handle, "_HID"))
 +	if (!acpi_has_method(handle, "_DEP") || !acpi_has_method(handle, "_HID"))
  		return 0;
  
- 	status = acpi_evaluate_reference(handle, "_DEP", NULL, &dep_devices);
- 	if (ACPI_FAILURE(status)) {
+ 	if (!acpi_evaluate_reference(handle, "_DEP", NULL, &dep_devices)) {
  		acpi_handle_debug(handle, "Failed to evaluate _DEP.\n");
  		return 0;
  	}