Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android

[firefly-linux-kernel-4.4.55.git] / arch / unicore32 / kernel / pci.c

diff --git a/arch/unicore32/kernel/pci.c b/arch/unicore32/kernel/pci.c
index 374a055a8e6bb5886ead0595dabaa5627cf5868a..d45fa5f3e9c41dae187ebebf59f18c8b595cef9c 100644 (file)
--- a/arch/unicore32/kernel/pci.c
+++ b/arch/unicore32/kernel/pci.c
@@ -266,17 +266,10 @@ static int __init pci_common_init(void)
        pci_fixup_irqs(pci_common_swizzle, pci_puv3_map_irq);
 
        if (!pci_has_flag(PCI_PROBE_ONLY)) {
-               /*
-                * Size the bridge windows.
-                */
                pci_bus_size_bridges(puv3_bus);
-
-               /*
-                * Assign resources.
-                */
                pci_bus_assign_resources(puv3_bus);
        }
-
+       pci_bus_add_devices(puv3_bus);
        return 0;
 }
 subsys_initcall(pci_common_init);