[PATCH 14/23] PCI: kill pci_fixup_parent_subordinate_busnr()
From: Yinghai Lu <yinghai@kernel.org>
Date: 2012-02-24 10:24:22
Also in:
linux-pci, lkml
Subsystem:
pci subsystem, the rest · Maintainers:
Bjorn Helgaas, Linus Torvalds
Now we can safely extend parent top and shrink them according iobusn_resource tree. Don't need that any more. Signed-off-by: Yinghai Lu <yinghai@kernel.org> --- 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 0718ed3..36dd25a 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c@@ -608,22 +608,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->subordinate < max) { - parent->subordinate = max; - pci_write_config_byte(parent->self, PCI_SUBORDINATE_BUS, max); - parent = parent->parent; - } -} - static void __devinit pci_bus_update_top(struct pci_bus *parent, long size, struct resource *parent_res) {
@@ -959,23 +943,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.
--
1.7.7