]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
PCI: mips: use generic INTx swizzle from PCI core
authorBjorn Helgaas <bjorn.helgaas@hp.com>
Wed, 17 Dec 2008 04:37:10 +0000 (21:37 -0700)
committerJesse Barnes <jbarnes@virtuousgeek.org>
Wed, 7 Jan 2009 19:13:14 +0000 (11:13 -0800)
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>
arch/mips/pci/pci.c

index fa63dc25125d0c46b46cd2b0fbce0676f97900f4..b0eb9e75c6829444c10815312f0e0a145cb331e9 100644 (file)
@@ -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;