Commit eae10935 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/misc' 

- Use METHOD_NAME__UID instead of plain string to make it easier to find
  all uses (Yipeng Zou)

* pci/misc:
  PCI/ACPI: Use METHOD_NAME__UID instead of plain string
parents 84c34829 9f0b4cc1

drivers/pci/pci-acpi.c

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ static acpi_status acpi_match_rc(acpi_handle handle, u32 lvl, void *context, 
	unsigned long long uid;

	acpi_status status;



	status = acpi_evaluate_integer(handle, "_UID", NULL, &uid);

	status = acpi_evaluate_integer(handle, METHOD_NAME__UID, NULL, &uid);

	if (ACPI_FAILURE(status) || uid != *segment)

		return AE_CTRL_DEPTH;