Merge branch 'bkl-removal' of git://git.lwn.net/linux-2.6

[linux-2.6-omap-h63xx.git] / arch / sh / drivers / pci / pci.c

diff --git a/arch/sh/drivers/pci/pci.c b/arch/sh/drivers/pci/pci.c
index d3839e609aacc1f9d0767c218d716053e139137e..e36c7b870861ada365ccacad17b94108a851a6d4 100644 (file)
--- a/arch/sh/drivers/pci/pci.c
+++ b/arch/sh/drivers/pci/pci.c
@@ -21,26 +21,6 @@
 #include <linux/init.h>
 #include <asm/io.h>
 
-static inline u8 bridge_swizzle(u8 pin, u8 slot)
-{
-       return (((pin - 1) + slot) % 4) + 1;
-}
-
-static u8 __init simple_swizzle(struct pci_dev *dev, u8 *pinp)
-{
-       u8 pin = *pinp;
-
-       while (dev->bus->parent) {
-               pin = bridge_swizzle(pin, PCI_SLOT(dev->devfn));
-               /* 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;
@@ -61,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;
 }