Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4a9329a0 authored by Jason Gunthorpe's avatar Jason Gunthorpe Committed by Jason Cooper
Browse files

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: default avatarJason Gunthorpe <jgunthorpe@obsidianresearch.com>
Acked-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarJason Cooper <jason@lakedaemon.net>
parent 98adf932

arch/arm/mach-kirkwood/pcie.c

+1 −17
Original line number Diff line number Diff line
@@ -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)