diff options
| author | Jason Gunthorpe <jgunthorpe@obsidianresearch.com> | 2012-11-21 00:15:11 -0700 |
|---|---|---|
| committer | Jason Cooper <jason@lakedaemon.net> | 2012-11-21 20:09:11 +0000 |
| commit | 4a9329a04ceec56fc1ec155b6ea4d8b50f350a7b (patch) | |
| tree | 1907795ddcaa9d45de15548611920a1a6a9ef8a9 /arch/arm/mach-kirkwood | |
| parent | 98adf932c0adc5e57257fe4230d89bda306a4037 (diff) | |
| download | blackbird-op-linux-4a9329a04ceec56fc1ec155b6ea4d8b50f350a7b.tar.gz blackbird-op-linux-4a9329a04ceec56fc1ec155b6ea4d8b50f350a7b.zip | |
ARM: Kirkwood: Use hw_pci.ops instead of hw_pci.scan
The kirkwood_pcie_scan_bus function duplicates the common code in
bios32.c, passing ops in will use the common code..
Signed-off-by: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
Acked-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Diffstat (limited to 'arch/arm/mach-kirkwood')
| -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) } 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) |
