Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[sfrench/cifs-2.6.git] / arch / arm / mach-mv78xx0 / pcie.c

diff --git a/arch/arm/mach-mv78xx0/pcie.c b/arch/arm/mach-mv78xx0/pcie.c
index 81ff4327a96296c25a68b83694dfe2259f100347..636d84b4046647f0810167e93472cc0375531e86 100644 (file)
--- a/arch/arm/mach-mv78xx0/pcie.c
+++ b/arch/arm/mach-mv78xx0/pcie.c
@@ -194,16 +194,22 @@ static void rc_pci_fixup(struct pci_dev *dev)
 }
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_MARVELL, PCI_ANY_ID, rc_pci_fixup);
 
-static struct pci_bus __init *
-mv78xx0_pcie_scan_bus(int nr, struct pci_sys_data *sys)
+static int __init mv78xx0_pcie_scan_bus(int nr, struct pci_host_bridge *bridge)
 {
+       struct pci_sys_data *sys = pci_host_bridge_priv(bridge);
+
        if (nr >= num_pcie_ports) {
                BUG();
-               return NULL;
+               return -EINVAL;
        }
 
-       return pci_scan_root_bus(NULL, sys->busnr, &pcie_ops, sys,
-                                &sys->resources);
+       list_splice_init(&sys->resources, &bridge->windows);
+       bridge->dev.parent = NULL;
+       bridge->sysdata = sys;
+       bridge->busnr = sys->busnr;
+       bridge->ops = &pcie_ops;
+
+       return pci_scan_root_bus_bridge(bridge);
 }
 
 static int __init mv78xx0_pcie_map_irq(const struct pci_dev *dev, u8 slot,