summaryrefslogtreecommitdiffstats
path: root/arch/m68k
diff options
context:
space:
mode:
authorJiang Liu <liuj97@gmail.com>2013-05-25 21:48:35 +0800
committerBjorn Helgaas <bhelgaas@google.com>2013-06-14 17:38:39 -0600
commitd9e6ba5fed08b64f8dcabcc82d9706fd8ec1f121 (patch)
treea992325c657037e191a96f5ce7e6bbb8eb4c153b /arch/m68k
parent70efde2a2920c12f2b14eb640944ca7e61b2c02d (diff)
downloadlinux-stable-d9e6ba5fed08b64f8dcabcc82d9706fd8ec1f121.tar.gz
linux-stable-d9e6ba5fed08b64f8dcabcc82d9706fd8ec1f121.tar.bz2
linux-stable-d9e6ba5fed08b64f8dcabcc82d9706fd8ec1f121.zip
m68k/PCI: Remove redundant call of pci_bus_add_devices()
pci_scan_bus() has called pci_bus_add_devices() already, so remove the redundant call of pci_bus_add_devices(). subsys_init() callbacks will be invoked before device_init() callbacks, so it should be safe to remove the redundant calls. [bhelgaas: split unicore32 into a separate patch] Signed-off-by: Jiang Liu <jiang.liu@huawei.com> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Acked-by: Greg Ungerer <gerg@uclinux.org>
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 8572246db84d..b33f97a13e6d 100644
--- a/arch/m68k/platform/coldfire/pci.c
+++ b/arch/m68k/platform/coldfire/pci.c
@@ -320,7 +320,6 @@ static int __init mcf_pci_init(void)
pci_bus_size_bridges(rootbus);
pci_bus_assign_resources(rootbus);
pci_enable_bridges(rootbus);
- pci_bus_add_devices(rootbus);
return 0;
}