2 files changed, 61 insertions, 91 deletions

diff --git a/arch/sh/boards/superh/microdev/irq.c b/arch/sh/boards/superh/microdev/irq.c
index 236398fbc083..8c64baa30364 100644
--- a/arch/sh/boards/superh/microdev/irq.c
+++ b/arch/sh/boards/superh/microdev/irq.c
@@ -11,14 +11,12 @@
 
 #include <linux/init.h>
 #include <linux/irq.h>
-
 #include <asm/system.h>
 #include <asm/io.h>
 #include <asm/microdev.h>
 
 #define NUM_EXTERNAL_IRQS 16    /* IRL0 .. IRL15 */
 
-
 static const struct {
         unsigned char fpgaIrq;
         unsigned char mapped;
@@ -93,53 +91,42 @@ static struct hw_interrupt_type microdev_irq_type = {
 
 static void disable_microdev_irq(unsigned int irq)
 {
-        unsigned int flags;
         unsigned int fpgaIrq;
 
-        if (irq >= NUM_EXTERNAL_IRQS) return;
-        if (!fpgaIrqTable[irq].mapped) return;
+        if (irq >= NUM_EXTERNAL_IRQS)
+                return;
+        if (!fpgaIrqTable[irq].mapped)
+                return;
 
         fpgaIrq = fpgaIrqTable[irq].fpgaIrq;
 
-                /* disable interrupts */
-        local_irq_save(flags);
-
-                /* disable interupts on the FPGA INTC register */
+        /* disable interupts on the FPGA INTC register */
         ctrl_outl(MICRODEV_FPGA_INTC_MASK(fpgaIrq), MICRODEV_FPGA_INTDSB_REG);
-
-                /* restore interrupts */
-        local_irq_restore(flags);
 }
 
 static void enable_microdev_irq(unsigned int irq)
 {
         unsigned long priorityReg, priorities, pri;
-        unsigned int flags;
         unsigned int fpgaIrq;
 
-
-        if (irq >= NUM_EXTERNAL_IRQS) return;
-        if (!fpgaIrqTable[irq].mapped) return;
+        if (unlikely(irq >= NUM_EXTERNAL_IRQS))
+                return;
+        if (unlikely(!fpgaIrqTable[irq].mapped))
+                return;
 
         pri = 15 - irq;
 
         fpgaIrq = fpgaIrqTable[irq].fpgaIrq;
         priorityReg = MICRODEV_FPGA_INTPRI_REG(fpgaIrq);
 
-                /* disable interrupts */
-        local_irq_save(flags);
-
-                /* set priority for the interrupt */
+        /* set priority for the interrupt */
         priorities = ctrl_inl(priorityReg);
         priorities &= ~MICRODEV_FPGA_INTPRI_MASK(fpgaIrq);
         priorities |= MICRODEV_FPGA_INTPRI_LEVEL(fpgaIrq, pri);
         ctrl_outl(priorities, priorityReg);
 
-                /* enable interupts on the FPGA INTC register */
+        /* enable interupts on the FPGA INTC register */
         ctrl_outl(MICRODEV_FPGA_INTC_MASK(fpgaIrq), MICRODEV_FPGA_INTENB_REG);
-
-                /* restore interrupts */
-        local_irq_restore(flags);
 }
 
         /* This functions sets the desired irq handler to be a MicroDev type */
@@ -158,9 +145,7 @@ static void mask_and_ack_microdev(unsigned int irq)
 static void end_microdev_irq(unsigned int irq)
 {
         if (!(irq_desc[irq].status & (IRQ_DISABLED|IRQ_INPROGRESS)))
-        {
                 enable_microdev_irq(irq);
-        }
 }
 
 extern void __init init_microdev_irq(void)
@@ -171,9 +156,7 @@ extern void __init init_microdev_irq(void)
         ctrl_outl(~0ul, MICRODEV_FPGA_INTDSB_REG);
 
         for (i = 0; i < NUM_EXTERNAL_IRQS; i++)
-        {
                 make_microdev_irq(i);
-        }
 }
 
 extern void microdev_print_fpga_intc_status(void)
diff --git a/arch/sh/boards/superh/microdev/setup.c b/arch/sh/boards/superh/microdev/setup.c
index 61b402a3f5d7..031c814e6e76 100644
--- a/arch/sh/boards/superh/microdev/setup.c
+++ b/arch/sh/boards/superh/microdev/setup.c
@@ -10,7 +10,6 @@
  * May be copied or modified under the terms of the GNU General Public
  * License.  See linux/COPYING for more information.
  */
-
 #include <linux/init.h>
 #include <linux/platform_device.h>
 #include <linux/ioport.h>
@@ -21,41 +20,6 @@
 
 extern void microdev_heartbeat(void);
 
-/*
- * The Machine Vector
- */
-
-struct sh_machine_vector mv_sh4202_microdev __initmv = {
-        .mv_nr_irqs             = 72,           /* QQQ need to check this - use the MACRO */
-
-        .mv_inb                 = microdev_inb,
-        .mv_inw                 = microdev_inw,
-        .mv_inl                 = microdev_inl,
-        .mv_outb                = microdev_outb,
-        .mv_outw                = microdev_outw,
-        .mv_outl                = microdev_outl,
-
-        .mv_inb_p               = microdev_inb_p,
-        .mv_inw_p               = microdev_inw_p,
-        .mv_inl_p               = microdev_inl_p,
-        .mv_outb_p              = microdev_outb_p,
-        .mv_outw_p              = microdev_outw_p,
-        .mv_outl_p              = microdev_outl_p,
-
-        .mv_insb                = microdev_insb,
-        .mv_insw                = microdev_insw,
-        .mv_insl                = microdev_insl,
-        .mv_outsb               = microdev_outsb,
-        .mv_outsw               = microdev_outsw,
-        .mv_outsl               = microdev_outsl,
-
-        .mv_init_irq            = init_microdev_irq,
-
-#ifdef CONFIG_HEARTBEAT
-        .mv_heartbeat           = microdev_heartbeat,
-#endif
-};
-ALIAS_MV(sh4202_microdev)
 
 /****************************************************************************/
 
@@ -113,11 +77,6 @@ ALIAS_MV(sh4202_microdev)
         /* assume a Keyboard Controller is present */
 int microdev_kbd_controller_present = 1;
 
-const char *get_system_type(void)
-{
-        return "SH4-202 MicroDev";
-}
-
 static struct resource smc91x_resources[] = {
         [0] = {
                 .start          = 0x300,
@@ -291,25 +250,9 @@ static int __init microdev_devices_setup(void)
         return platform_add_devices(microdev_devices, ARRAY_SIZE(microdev_devices));
 }
 
-__initcall(microdev_devices_setup);
-
-void __init platform_setup(void)
-{
-        int * const fpgaRevisionRegister = (int*)(MICRODEV_FPGA_GP_BASE + 0x8ul);
-        const int fpgaRevision = *fpgaRevisionRegister;
-        int * const CacheControlRegister = (int*)CCR;
-
-        printk("SuperH %s board (FPGA rev: 0x%0x, CCR: 0x%0x)\n",
-                get_system_type(), fpgaRevision, *CacheControlRegister);
-}
-
-
-/****************************************************************************/
-
-
-        /*
-         * Setup for the SMSC FDC37C93xAPM
-         */
+/*
+ * Setup for the SMSC FDC37C93xAPM
+ */
 static int __init smsc_superio_setup(void)
 {
 
@@ -412,8 +355,52 @@ static int __init smsc_superio_setup(void)
         return 0;
 }
 
+static void __init microdev_setup(char **cmdline_p)
+{
+        int * const fpgaRevisionRegister = (int*)(MICRODEV_FPGA_GP_BASE + 0x8ul);
+        const int fpgaRevision = *fpgaRevisionRegister;
+        int * const CacheControlRegister = (int*)CCR;
+
+        device_initcall(microdev_devices_setup);
+        device_initcall(smsc_superio_setup);
 
-/* This is grotty, but, because kernel is always referenced on the link line
- * before any devices, this is safe.
+        printk("SuperH %s board (FPGA rev: 0x%0x, CCR: 0x%0x)\n",
+                get_system_type(), fpgaRevision, *CacheControlRegister);
+}
+
+/*
+ * The Machine Vector
  */
-__initcall(smsc_superio_setup);
+struct sh_machine_vector mv_sh4202_microdev __initmv = {
+        .mv_name                = "SH4-202 MicroDev",
+        .mv_setup               = microdev_setup,
+        .mv_nr_irqs             = 72,           /* QQQ need to check this - use the MACRO */
+
+        .mv_inb                 = microdev_inb,
+        .mv_inw                 = microdev_inw,
+        .mv_inl                 = microdev_inl,
+        .mv_outb                = microdev_outb,
+        .mv_outw                = microdev_outw,
+        .mv_outl                = microdev_outl,
+
+        .mv_inb_p               = microdev_inb_p,
+        .mv_inw_p               = microdev_inw_p,
+        .mv_inl_p               = microdev_inl_p,
+        .mv_outb_p              = microdev_outb_p,
+        .mv_outw_p              = microdev_outw_p,
+        .mv_outl_p              = microdev_outl_p,
+
+        .mv_insb                = microdev_insb,
+        .mv_insw                = microdev_insw,
+        .mv_insl                = microdev_insl,
+        .mv_outsb               = microdev_outsb,
+        .mv_outsw               = microdev_outsw,
+        .mv_outsl               = microdev_outsl,
+
+        .mv_init_irq            = init_microdev_irq,
+
+#ifdef CONFIG_HEARTBEAT
+        .mv_heartbeat           = microdev_heartbeat,
+#endif
+};
+ALIAS_MV(sh4202_microdev)