summaryrefslogtreecommitdiff
path: root/arch/m68k
diff options
context:
space:
mode:
authorYinghai Lu <yinghai@kernel.org>2013-07-22 21:37:17 (GMT)
committerBjorn Helgaas <bhelgaas@google.com>2013-07-25 18:35:03 (GMT)
commit928bea964827d7824b548c1f8e06eccbbc4d0d7d (patch)
tree13110a5f05a65aa487cee8be5bd58017986f4929 /arch/m68k
parent55ed83a615730c2578da155bc99b68f4417ffe20 (diff)
downloadlinux-fsl-qoriq-928bea964827d7824b548c1f8e06eccbbc4d0d7d.tar.xz
PCI: Delay enabling bridges until they're needed
We currently enable PCI bridges after scanning a bus and assigning resources. This is often done in arch code. This patch changes this so we don't enable a bridge until necessary, i.e., until we enable a PCI device behind the bridge. We do this in the generic pci_enable_device() path, so this also removes the arch-specific code to enable bridges. [bhelgaas: changelog] Signed-off-by: Yinghai Lu <yinghai@kernel.org> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Diffstat (limited to 'arch/m68k')
-rw-r--r--arch/m68k/platform/coldfire/pci.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/m68k/platform/coldfire/pci.c b/arch/m68k/platform/coldfire/pci.c
index b33f97a..df96792 100644
--- a/arch/m68k/platform/coldfire/pci.c
+++ b/arch/m68k/platform/coldfire/pci.c
@@ -319,7 +319,6 @@ static int __init mcf_pci_init(void)
pci_fixup_irqs(pci_common_swizzle, mcf_pci_map_irq);
pci_bus_size_bridges(rootbus);
pci_bus_assign_resources(rootbus);
- pci_enable_bridges(rootbus);
return 0;
}