diff options
author | Yinghai Lu <yinghai@kernel.org> | 2012-09-17 22:24:29 -0700 |
---|---|---|
committer | Yinghai Lu <yinghai@kernel.org> | 2012-09-17 22:24:29 -0700 |
commit | 15cc5df550d5e076d5753df280d24a623bd90930 (patch) | |
tree | d9d75e3d7214b8037260b7e637c53d5d9321c6f4 | |
parent | cd13456afb1fe18c415198a85dcfe8473946c3b7 (diff) | |
download | linux-yinghai-15cc5df550d5e076d5753df280d24a623bd90930.tar.gz |
PCI: Kill pci_fixup_parent_subordinate_busnr()
Now we can safely extend parent top and shrink them by probing them.
Don't need that anymore.
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
-rw-r--r-- | drivers/pci/probe.c | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index c07a025934ece3..06aedfaf54ea0a 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -862,22 +862,6 @@ struct pci_bus *__ref pci_add_new_bus(struct pci_bus *parent, struct pci_dev *de return child; } -static void pci_fixup_parent_subordinate_busnr(struct pci_bus *child, int max) -{ - struct pci_bus *parent = child->parent; - - /* Attempts to fix that up are really dangerous unless - we're going to re-assign all bus numbers. */ - if (!pcibios_assign_all_busses()) - return; - - while (parent->parent && parent->busn_res.end < max) { - parent->busn_res.end = max; - pci_write_config_byte(parent->self, PCI_SUBORDINATE_BUS, max); - parent = parent->parent; - } -} - static void __devinit pci_bus_extend_top(struct pci_bus *parent, long size, struct resource *parent_res) { @@ -1123,23 +1107,7 @@ int __devinit pci_scan_bridge(struct pci_bus *bus, struct pci_dev *dev, int max, if (!is_cardbus) { child->bridge_ctl = bctl; - /* - * Adjust subordinate busnr in parent buses. - * We do this before scanning for children because - * some devices may not be detected if the bios - * was lazy. - */ - pci_fixup_parent_subordinate_busnr(child, max); - /* Now we can scan all subordinate buses... */ max = pci_scan_child_bus(child); - /* - * now fix it up again since we have found - * the real value of max. - */ - pci_fixup_parent_subordinate_busnr(child, max); - - } else { - pci_fixup_parent_subordinate_busnr(child, max); } /* * Set the subordinate bus number to its real value. |