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

Commit 06df6993 authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Jesse Barnes
Browse files

PCI: arm: use generic INTx swizzle from PCI core 



Use the generic pci_common_swizzle() instead of arch-specific code.

Signed-off-by: default avatarBjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
parent 3e08601f

arch/arm/include/asm/mach/pci.h

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ struct pci_sys_data { 
/*

 * This is the standard PCI-PCI bridge swizzling algorithm.

 */

u8 pci_std_swizzle(struct pci_dev *dev, u8 *pinp);

#define pci_std_swizzle pci_common_swizzle



/*

 * Call this with your hw_pci struct to initialise the PCI system.

arch/arm/kernel/bios32.c

+0 −27
Original line number Diff line number Diff line
@@ -479,33 +479,6 @@ EXPORT_SYMBOL(pcibios_resource_to_bus); 
EXPORT_SYMBOL(pcibios_bus_to_resource);

#endif



/*

 * This is the standard PCI-PCI bridge swizzling algorithm:

 *

 *   Dev: 0  1  2  3

 *    A   A  B  C  D

 *    B   B  C  D  A

 *    C   C  D  A  B

 *    D   D  A  B  C

 *        ^^^^^^^^^^ irq pin on bridge

 */

u8 __devinit pci_std_swizzle(struct pci_dev *dev, u8 *pinp)

{

	int pin = *pinp;



	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);

}



/*

 * Swizzle the device pin each time we cross a bridge.

 * This might update pin and returns the slot number.