PCI: sh: 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 sh simple_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>

diff --git a/arch/sh/drivers/pci/pci.c b/arch/sh/drivers/pci/pci.c
index aea3b6b3033a7ec5a1ea5ea8f34030d5e5f5228e..e36c7b870861ada365ccacad17b94108a851a6d4 100644 (file)
--- a/arch/sh/drivers/pci/pci.c
+++ b/arch/sh/drivers/pci/pci.c
@@ -21,21 +21,6 @@
 #include <linux/init.h>
 #include <asm/io.h>
 
-static u8 __init simple_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_channel *p;
@@ -56,7 +41,7 @@ static int __init pcibios_init(void)
                busno = bus->subordinate + 1;
        }
 
-       pci_fixup_irqs(simple_swizzle, pcibios_map_platform_irq);
+       pci_fixup_irqs(pci_common_swizzle, pcibios_map_platform_irq);
 
        return 0;
 }