forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

PCI: mips: use generic pci_swizzle_interrupt_pin()

Browse source 
Use the generic pci_swizzle_interrupt_pin() instead of arch-specific code.

Acked-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
This commit is contained in:
Bjorn Helgaas 2008-12-09 16:12:17 -07:00 • committed by Jesse Barnes
commit 30d546dac9
2 changed files with 1 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

6
arch/mips/pci/pci-ip27.c
View file

@ -146,12 +146,6 @@ int __devinit pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
return 0; return 0;
} }
/* Most MIPS systems have straight-forward swizzling needs. */
static inline u8 bridge_swizzle(u8 pin, u8 slot)
{
return (((pin - 1) + slot) % 4) + 1;
}
static inline struct pci_dev *bridge_root_dev(struct pci_dev *dev) static inline struct pci_dev *bridge_root_dev(struct pci_dev *dev)
{ {
while (dev->bus->parent) { while (dev->bus->parent) {

9
arch/mips/pci/pci.c
View file

@ -149,19 +149,12 @@ out:
"Skipping PCI bus scan due to resource conflict\n"); "Skipping PCI bus scan due to resource conflict\n");
} }
/* Most MIPS systems have straight-forward swizzling needs. */
static inline u8 bridge_swizzle(u8 pin, u8 slot)
{
return (((pin - 1) + slot) % 4) + 1;
}
static u8 __init common_swizzle(struct pci_dev *dev, u8 *pinp) static u8 __init common_swizzle(struct pci_dev *dev, u8 *pinp)
{ {
u8 pin = *pinp; u8 pin = *pinp;
while (dev->bus->parent) { while (dev->bus->parent) {
pin = bridge_swizzle(pin, PCI_SLOT(dev->devfn)); pin = pci_swizzle_interrupt_pin(dev, pin);
/* Move up the chain of bridges. */ /* Move up the chain of bridges. */
dev = dev->bus->self; dev = dev->bus->self;
} }