PCI: sh: use generic pci_swizzle_interrupt_pin()

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

Acked-by: Paul Mundt <lethal@linux-sh.org>
Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>

diff --git a/arch/sh/drivers/pci/ops-cayman.c b/arch/sh/drivers/pci/ops-cayman.c
index 5ccf9ea3a9de5dd629ca5dc88cb2364ffe06c2a8..38ef76207af6c8ecaf43c53ccc0d98013396ad9d 100644 (file)
--- a/arch/sh/drivers/pci/ops-cayman.c
+++ b/arch/sh/drivers/pci/ops-cayman.c
@@ -5,11 +5,6 @@
 #include <cpu/irq.h>
 #include "pci-sh5.h"
 
-static inline u8 bridge_swizzle(u8 pin, u8 slot)
-{
-       return (((pin - 1) + slot) % 4) + 1;
-}
-
 int __init pcibios_map_platform_irq(struct pci_dev *dev, u8 slot, u8 pin)
 {
        int result = -1;
@@ -42,7 +37,7 @@ int __init pcibios_map_platform_irq(struct pci_dev *dev, u8 slot, u8 pin)
        while (dev->bus->number > 0) {
 
                slot = path[i].slot = PCI_SLOT(dev->devfn);
-               pin = path[i].pin = bridge_swizzle(pin, slot);
+               pin = path[i].pin = pci_swizzle_interrupt_pin(dev, pin);
                dev = dev->bus->self;
                i++;
                if (i > 3) panic("PCI path to root bus too long!\n");
@@ -56,7 +51,7 @@ int __init pcibios_map_platform_irq(struct pci_dev *dev, u8 slot, u8 pin)
        if ((slot < 3) || (i == 0)) {
                /* Bus 0 (incl. PCI-PCI bridge itself) : perform the final
                   swizzle now. */
-               result = IRQ_INTA + bridge_swizzle(pin, slot) - 1;
+               result = IRQ_INTA + pci_swizzle_interrupt_pin(dev, pin) - 1;
        } else {
                i--;
                slot = path[i].slot;

diff --git a/arch/sh/drivers/pci/pci.c b/arch/sh/drivers/pci/pci.c
index d3839e609aacc1f9d0767c218d716053e139137e..aea3b6b3033a7ec5a1ea5ea8f34030d5e5f5228e 100644 (file)
--- a/arch/sh/drivers/pci/pci.c
+++ b/arch/sh/drivers/pci/pci.c
@@ -21,17 +21,12 @@
 #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));
+               pin = pci_swizzle_interrupt_pin(dev, pin);
                /* Move up the chain of bridges. */
                dev = dev->bus->self;
        }