diff options
-rw-r--r-- | arch/arm/mach-kirkwood/pcie.c | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/arch/arm/mach-kirkwood/pcie.c b/arch/arm/mach-kirkwood/pcie.c index 258581131670..1e9f90ee0f5c 100644 --- a/arch/arm/mach-kirkwood/pcie.c +++ b/arch/arm/mach-kirkwood/pcie.c | |||
@@ -225,22 +225,6 @@ static void __devinit rc_pci_fixup(struct pci_dev *dev) | |||
225 | } | 225 | } |
226 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_MARVELL, PCI_ANY_ID, rc_pci_fixup); | 226 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_MARVELL, PCI_ANY_ID, rc_pci_fixup); |
227 | 227 | ||
228 | static struct pci_bus __init * | ||
229 | kirkwood_pcie_scan_bus(int nr, struct pci_sys_data *sys) | ||
230 | { | ||
231 | struct pci_bus *bus; | ||
232 | |||
233 | if (nr < num_pcie_ports) { | ||
234 | bus = pci_scan_root_bus(NULL, sys->busnr, &pcie_ops, sys, | ||
235 | &sys->resources); | ||
236 | } else { | ||
237 | bus = NULL; | ||
238 | BUG(); | ||
239 | } | ||
240 | |||
241 | return bus; | ||
242 | } | ||
243 | |||
244 | static int __init kirkwood_pcie_map_irq(const struct pci_dev *dev, u8 slot, | 228 | static int __init kirkwood_pcie_map_irq(const struct pci_dev *dev, u8 slot, |
245 | u8 pin) | 229 | u8 pin) |
246 | { | 230 | { |
@@ -252,8 +236,8 @@ static int __init kirkwood_pcie_map_irq(const struct pci_dev *dev, u8 slot, | |||
252 | 236 | ||
253 | static struct hw_pci kirkwood_pci __initdata = { | 237 | static struct hw_pci kirkwood_pci __initdata = { |
254 | .setup = kirkwood_pcie_setup, | 238 | .setup = kirkwood_pcie_setup, |
255 | .scan = kirkwood_pcie_scan_bus, | ||
256 | .map_irq = kirkwood_pcie_map_irq, | 239 | .map_irq = kirkwood_pcie_map_irq, |
240 | .ops = &pcie_ops, | ||
257 | }; | 241 | }; |
258 | 242 | ||
259 | static void __init add_pcie_port(int index, void __iomem *base) | 243 | static void __init add_pcie_port(int index, void __iomem *base) |