From 9c8af418b4e57283af7dcee73227f2508f5d54cc Mon Sep 17 00:00:00 2001
From: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
Date: Wed, 21 Nov 2012 00:15:11 -0700
Subject: [PATCH] --- yaml --- r: 339855 b: refs/heads/master c:
 4a9329a04ceec56fc1ec155b6ea4d8b50f350a7b h: refs/heads/master i:   339853:
 5ba9929813ae7784016c2274869ceeee1219d1e0   339851:
 71d0c4a37313ce76dee57774574d9155e65db13a   339847:
 8b744937d52b5392f31c9999836816f54e963889   339839:
 f54353621b1b62d9692929723351c384037aa446 v: v3

---
 [refs]                              |  2 +-
 trunk/arch/arm/mach-kirkwood/pcie.c | 18 +-----------------
 2 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/[refs] b/[refs]
index 264f896d159d..7407642affbe 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 98adf932c0adc5e57257fe4230d89bda306a4037
+refs/heads/master: 4a9329a04ceec56fc1ec155b6ea4d8b50f350a7b
diff --git a/trunk/arch/arm/mach-kirkwood/pcie.c b/trunk/arch/arm/mach-kirkwood/pcie.c
index 258581131670..1e9f90ee0f5c 100644
--- a/trunk/arch/arm/mach-kirkwood/pcie.c
+++ b/trunk/arch/arm/mach-kirkwood/pcie.c
@@ -225,22 +225,6 @@ static void __devinit 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 *
-kirkwood_pcie_scan_bus(int nr, struct pci_sys_data *sys)
-{
-	struct pci_bus *bus;
-
-	if (nr < num_pcie_ports) {
-		bus = pci_scan_root_bus(NULL, sys->busnr, &pcie_ops, sys,
-					&sys->resources);
-	} else {
-		bus = NULL;
-		BUG();
-	}
-
-	return bus;
-}
-
 static int __init kirkwood_pcie_map_irq(const struct pci_dev *dev, u8 slot,
 	u8 pin)
 {
@@ -252,8 +236,8 @@ static int __init kirkwood_pcie_map_irq(const struct pci_dev *dev, u8 slot,
 
 static struct hw_pci kirkwood_pci __initdata = {
 	.setup		= kirkwood_pcie_setup,
-	.scan		= kirkwood_pcie_scan_bus,
 	.map_irq	= kirkwood_pcie_map_irq,
+	.ops            = &pcie_ops,
 };
 
 static void __init add_pcie_port(int index, void __iomem *base)