diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/pci-acpi.h | 9 | ||||
-rw-r--r-- | include/linux/pci_hotplug.h | 2 |
2 files changed, 11 insertions, 0 deletions
diff --git a/include/linux/pci-acpi.h b/include/linux/pci-acpi.h index 871e096e0fbc..042c166f65d5 100644 --- a/include/linux/pci-acpi.h +++ b/include/linux/pci-acpi.h | |||
@@ -60,6 +60,15 @@ static inline acpi_handle acpi_find_root_bridge_handle(struct pci_dev *pdev) | |||
60 | return acpi_get_pci_rootbridge_handle(pci_domain_nr(pdev->bus), | 60 | return acpi_get_pci_rootbridge_handle(pci_domain_nr(pdev->bus), |
61 | pdev->bus->number); | 61 | pdev->bus->number); |
62 | } | 62 | } |
63 | |||
64 | static inline acpi_handle acpi_pci_get_bridge_handle(struct pci_bus *pbus) | ||
65 | { | ||
66 | int seg = pci_domain_nr(pbus), busnr = pbus->number; | ||
67 | struct pci_dev *bridge = pbus->self; | ||
68 | if (bridge) | ||
69 | return DEVICE_ACPI_HANDLE(&(bridge->dev)); | ||
70 | return acpi_get_pci_rootbridge_handle(seg, busnr); | ||
71 | } | ||
63 | #else | 72 | #else |
64 | #if !defined(AE_ERROR) | 73 | #if !defined(AE_ERROR) |
65 | typedef u32 acpi_status; | 74 | typedef u32 acpi_status; |
diff --git a/include/linux/pci_hotplug.h b/include/linux/pci_hotplug.h index a00bd1a0f156..f7cc204fab07 100644 --- a/include/linux/pci_hotplug.h +++ b/include/linux/pci_hotplug.h | |||
@@ -228,6 +228,8 @@ extern acpi_status acpi_get_hp_params_from_firmware(struct pci_bus *bus, | |||
228 | struct hotplug_params *hpp); | 228 | struct hotplug_params *hpp); |
229 | int acpi_get_hp_hw_control_from_firmware(struct pci_dev *dev, u32 flags); | 229 | int acpi_get_hp_hw_control_from_firmware(struct pci_dev *dev, u32 flags); |
230 | int acpi_root_bridge(acpi_handle handle); | 230 | int acpi_root_bridge(acpi_handle handle); |
231 | int acpi_pci_check_ejectable(struct pci_bus *pbus, acpi_handle handle); | ||
232 | int acpi_pci_detect_ejectable(struct pci_bus *pbus); | ||
231 | #endif | 233 | #endif |
232 | #endif | 234 | #endif |
233 | 235 | ||