]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
m68k/PCI: Remove redundant call of pci_bus_add_devices()
authorJiang Liu <liuj97@gmail.com>
Sat, 25 May 2013 13:48:35 +0000 (21:48 +0800)
committerBjorn Helgaas <bhelgaas@google.com>
Fri, 14 Jun 2013 23:38:39 +0000 (17:38 -0600)
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>
arch/m68k/platform/coldfire/pci.c

index 8572246db84d3fe35d9075a5157e42a3e0eb1e2e..b33f97a13e6d11650db6f5a183511356884ae51e 100644 (file)
@@ -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;
 }