diff options
| author |   Bjorn Helgaas <bhelgaas@google.com> | 2012-09-24 16:36:10 -0600 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2012-09-24 16:36:10 -0600 |
| commit | 18d63c35a265465b7137c4ea9c6b135aada13c3c (patch) | |
| tree | 1bff6e43ec609a86596d4704f3d50cf0adcfff74 /include | |
| parent | Merge branch 'pci/yinghai-revert-pci_find_bus-and-remove-cleanup' into next (diff) | |
| parent | PCI/ACPI: Use acpi_driver_data() rather than searching acpi_pci_roots (diff) | |
| download | wireguard-linux-18d63c35a265465b7137c4ea9c6b135aada13c3c.tar.xz wireguard-linux-18d63c35a265465b7137c4ea9c6b135aada13c3c.zip | |
Merge branch 'pci/taku-acpi-pci-host-bridge-v3' into next
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/acpi.h | 6 | ||||
| -rw-r--r-- | include/linux/pci-acpi.h | 17 |
2 files changed, 14 insertions, 9 deletions
diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 4f2a76224509..90be98981102 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -138,9 +138,9 @@ void acpi_penalize_isa_irq(int irq, int active); void acpi_pci_irq_disable (struct pci_dev *dev); struct acpi_pci_driver { - struct acpi_pci_driver *next; - int (*add)(acpi_handle handle); - void (*remove)(acpi_handle handle); + struct list_head node; + int (*add)(struct acpi_pci_root *root); + void (*remove)(struct acpi_pci_root *root); }; int acpi_pci_register_driver(struct acpi_pci_driver *driver); diff --git a/include/linux/pci-acpi.h b/include/linux/pci-acpi.h index 248fba2af98a..9a22b5efb384 100644 --- a/include/linux/pci-acpi.h +++ b/include/linux/pci-acpi.h @@ -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) { struct pci_bus *pbus = pdev->bus; + /* Find a PCI root bus */ while (!pci_is_root_bus(pbus)) 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) { - if (!pci_is_root_bus(pbus)) - return DEVICE_ACPI_HANDLE(&(pbus->self->dev)); - return acpi_get_pci_rootbridge_handle(pci_domain_nr(pbus), - pbus->number); + struct device *dev; + + if (pci_is_root_bus(pbus)) + dev = pbus->bridge; + else + dev = &pbus->self->dev; + + return DEVICE_ACPI_HANDLE(dev); } #endif |