Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

PCI: arm: use generic INTx swizzle from PCI core

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

Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>

authored by

Bjorn Helgaas and committed by
Jesse Barnes
06df6993 3e08601f

+1 -28
+1 -1
arch/arm/include/asm/mach/pci.h
··· 42 42 /* 43 43 * This is the standard PCI-PCI bridge swizzling algorithm. 44 44 */ 45 - u8 pci_std_swizzle(struct pci_dev *dev, u8 *pinp); 45 + #define pci_std_swizzle pci_common_swizzle 46 46 47 47 /* 48 48 * Call this with your hw_pci struct to initialise the PCI system.
-27
arch/arm/kernel/bios32.c
··· 480 480 #endif 481 481 482 482 /* 483 - * This is the standard PCI-PCI bridge swizzling algorithm: 484 - * 485 - * Dev: 0 1 2 3 486 - * A A B C D 487 - * B B C D A 488 - * C C D A B 489 - * D D A B C 490 - * ^^^^^^^^^^ irq pin on bridge 491 - */ 492 - u8 __devinit pci_std_swizzle(struct pci_dev *dev, u8 *pinp) 493 - { 494 - int pin = *pinp; 495 - 496 - while (dev->bus->self) { 497 - pin = pci_swizzle_interrupt_pin(dev, pin); 498 - /* 499 - * move up the chain of bridges, 500 - * swizzling as we go. 501 - */ 502 - dev = dev->bus->self; 503 - } 504 - *pinp = pin; 505 - 506 - return PCI_SLOT(dev->devfn); 507 - } 508 - 509 - /* 510 483 * Swizzle the device pin each time we cross a bridge. 511 484 * This might update pin and returns the slot number. 512 485 */