diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2013-01-17 18:00:36 -0500 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2013-01-17 18:00:36 -0500 |
commit | 708b59bfe1d1727451ca41f5dc4c17cf99dfaf51 (patch) | |
tree | da5fb7826f92f90b58bb5f33ec552b52d3667152 /drivers/acpi/pci_root.c | |
parent | b7040469de97d361120836b4140941a08d06f56f (diff) | |
parent | 6c0cc950ae670403a362bdcbf3cde0df33744928 (diff) |
Merge branch 'pci/rafael-set-root-bridge-handle' into next
* pci/rafael-set-root-bridge-handle:
ACPI / PCI: Set root bridge ACPI handle in advance
Diffstat (limited to 'drivers/acpi/pci_root.c')
-rw-r--r-- | drivers/acpi/pci_root.c | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c index 471b2dcb1c67..bf5108ad4d63 100644 --- a/drivers/acpi/pci_root.c +++ b/drivers/acpi/pci_root.c | |||
@@ -107,24 +107,6 @@ void acpi_pci_unregister_driver(struct acpi_pci_driver *driver) | |||
107 | } | 107 | } |
108 | EXPORT_SYMBOL(acpi_pci_unregister_driver); | 108 | EXPORT_SYMBOL(acpi_pci_unregister_driver); |
109 | 109 | ||
110 | acpi_handle acpi_get_pci_rootbridge_handle(unsigned int seg, unsigned int bus) | ||
111 | { | ||
112 | struct acpi_pci_root *root; | ||
113 | acpi_handle handle = NULL; | ||
114 | |||
115 | mutex_lock(&acpi_pci_root_lock); | ||
116 | list_for_each_entry(root, &acpi_pci_roots, node) | ||
117 | if ((root->segment == (u16) seg) && | ||
118 | (root->secondary.start == (u16) bus)) { | ||
119 | handle = root->device->handle; | ||
120 | break; | ||
121 | } | ||
122 | mutex_unlock(&acpi_pci_root_lock); | ||
123 | return handle; | ||
124 | } | ||
125 | |||
126 | EXPORT_SYMBOL_GPL(acpi_get_pci_rootbridge_handle); | ||
127 | |||
128 | /** | 110 | /** |
129 | * acpi_is_root_bridge - determine whether an ACPI CA node is a PCI root bridge | 111 | * acpi_is_root_bridge - determine whether an ACPI CA node is a PCI root bridge |
130 | * @handle - the ACPI CA node in question. | 112 | * @handle - the ACPI CA node in question. |