UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

PCI/ACPI: Use DEVICE_ACPI_HANDLE rather than searching acpi_pci_roots 

When we bind a device to an ACPI handle, the handle is stored in
dev->archdata.acpi_handle.  For such devices, there's no need to
search the acpi_pci_roots list with acpi_get_pci_rootbridge_handle();
we can just use DEVICE_ACPI_HANDLE(dev) directly.

[bhelgaas: changelog, reorder "if" to avoid negation]
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Cc: Len Brown <lenb@kernel.org>
Cc: linux-acpi@vger.kernel.org
This commit is contained in:
Yinghai Lu 2012-09-24 14:51:23 -06:00 committed by Bjorn Helgaas
parent c29aabe22e
commit 059e4ba292
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
include/linux/pci-acpi.h
View File

@ -22,19 +22,24 @@ extern phys_addr_t acpi_pci_root_get_mcfg_addr(acpi_handle handle);
static inline acpi_handle acpi_find_root_bridge_handle(struct pci_dev *pdev) static inline acpi_handle acpi_find_root_bridge_handle(struct pci_dev *pdev)
{ {
struct pci_bus *pbus = pdev->bus; struct pci_bus *pbus = pdev->bus;
/* Find a PCI root bus */ /* Find a PCI root bus */
while (!pci_is_root_bus(pbus)) while (!pci_is_root_bus(pbus))
pbus = pbus->parent; pbus = pbus->parent;
return acpi_get_pci_rootbridge_handle(pci_domain_nr(pbus),
pbus->number); return DEVICE_ACPI_HANDLE(pbus->bridge);
} }
static inline acpi_handle acpi_pci_get_bridge_handle(struct pci_bus *pbus) static inline acpi_handle acpi_pci_get_bridge_handle(struct pci_bus *pbus)
{ {
if (!pci_is_root_bus(pbus)) struct device *dev;
return DEVICE_ACPI_HANDLE(&(pbus->self->dev));
return acpi_get_pci_rootbridge_handle(pci_domain_nr(pbus), if (pci_is_root_bus(pbus))
pbus->number); dev = pbus->bridge;
else
dev = &pbus->self->dev;
return DEVICE_ACPI_HANDLE(dev);
} }
#endif #endif