ARM: PCI: integrator: use common PCI swizzle (b28626da) · Commits · e / devices / android_kernel_sony_msm8994

The Integrator swizzle function is almost the same as the standard PCI swizzle, except for an initial check for pin = 0. Make the integrator swizzle function a wrapper around the standard PCI swizzle function so we preseve this behaviour while using common code. [fix to use pci_std_swizzle from Linus Walleij] Signed-off-by:

Linus Walleij <linus.walleij@linaro.org> Signed-off-by:

Russell King <rmk+kernel@arm.linux.org.uk>

arch/arm/mach-integrator/pci.c

+3 −14

Original line number	Original line	Diff line number	Diff line
	@@ -70,21 +70,10 @@
	*/		*/
	static u8 __init integrator_swizzle(struct pci_dev dev, u8 pinp)		static u8 __init integrator_swizzle(struct pci_dev dev, u8 pinp)
	{		{
	int pin = *pinp;		if (*pinp == 0)
			*pinp = 1;

	if (pin == 0)		return pci_common_swizzle(dev, pinp);
	pin = 1;

	while (dev->bus->self) {
	pin = pci_swizzle_interrupt_pin(dev, pin);
	/*
	* move up the chain of bridges, swizzling as we go.
	*/
	dev = dev->bus->self;
	}
	*pinp = pin;

	return PCI_SLOT(dev->devfn);
	}		}

	static int irq_tab[4] __initdata = {		static int irq_tab[4] __initdata = {