diff options
| author | Bjorn Helgaas <bjorn.helgaas@hp.com> | 2008-12-16 21:37:10 -0700 |
|---|---|---|
| committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2009-01-07 11:13:14 -0800 |
| commit | 67eed58060ca2049fd59d35f426b6c7dbd51b20b (patch) | |
| tree | f9e923dc2f51dbd88eac640ad9efa93f4d87c848 /arch/mips/pci/pci.c | |
| parent | 06df69932add8108f599ef26fcdf36c4f8125e50 (diff) | |
| download | linux-67eed58060ca2049fd59d35f426b6c7dbd51b20b.tar.gz linux-67eed58060ca2049fd59d35f426b6c7dbd51b20b.tar.bz2 linux-67eed58060ca2049fd59d35f426b6c7dbd51b20b.zip | |
PCI: mips: use generic INTx swizzle from PCI core
Use the generic pci_common_swizzle() instead of arch-specific code.
Note that pci_common_swizzle() loops based on dev->bus->self, not
dev->bus->parent as the mips common_swizzle() did. I think they
are equivalent for this purpose.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Diffstat (limited to 'arch/mips/pci/pci.c')
| -rw-r--r-- | arch/mips/pci/pci.c | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/arch/mips/pci/pci.c b/arch/mips/pci/pci.c index fa63dc25125d..b0eb9e75c682 100644 --- a/arch/mips/pci/pci.c +++ b/arch/mips/pci/pci.c @@ -149,21 +149,6 @@ out: "Skipping PCI bus scan due to resource conflict\n"); } -static u8 __init common_swizzle(struct pci_dev *dev, u8 *pinp) -{ - u8 pin = *pinp; - - while (dev->bus->parent) { - pin = pci_swizzle_interrupt_pin(dev, pin); - /* Move up the chain of bridges. */ - dev = dev->bus->self; - } - *pinp = pin; - - /* The slot is the slot of the last bridge. */ - return PCI_SLOT(dev->devfn); -} - static int __init pcibios_init(void) { struct pci_controller *hose; @@ -172,7 +157,7 @@ static int __init pcibios_init(void) for (hose = hose_head; hose; hose = hose->next) pcibios_scanbus(hose); - pci_fixup_irqs(common_swizzle, pcibios_map_irq); + pci_fixup_irqs(pci_common_swizzle, pcibios_map_irq); pci_initialized = 1; |