3 files changed, 3 insertions, 29 deletions

diff --git a/arch/sh/drivers/pci/ops-cayman.c b/arch/sh/drivers/pci/ops-cayman.c
index 5ccf9ea3a9de..38ef76207af6 100644
--- 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 d3839e609aac..e36c7b870861 100644
--- 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;
 }
diff --git a/arch/sh/include/asm/mmu.h b/arch/sh/include/asm/mmu.h
index fdcb93bc6d11..6c43625bb1a5 100644
--- a/arch/sh/include/asm/mmu.h
+++ b/arch/sh/include/asm/mmu.h
@@ -9,7 +9,6 @@ typedef struct {
         mm_context_id_t         id;
         void                    *vdso;
 #else
-        struct vm_list_struct   *vmlist;
         unsigned long           end_brk;
 #endif
 #ifdef CONFIG_BINFMT_ELF_FDPIC