MIPS: MIPSsim: Fix unbalance brace in mipssim get_c0_compare_int()
Yoichi Yuasa [Wed, 8 Jul 2009 06:08:19 +0000 (15:08 +0900)]
cc1: warnings being treated as errors
arch/mips/mipssim/sim_time.c: In function 'get_c0_compare_int':
arch/mips/mipssim/sim_time.c:103: warning: ISO C90 forbids mixed declarations and code
arch/mips/mipssim/sim_time.c:116: error: expected declaration or statement at end of input
make[1]: *** [arch/mips/mipssim/sim_time.o] Error 1

Signed-off-by: Yoichi Yuasa <yuasa@linux-mips.org>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

arch/mips/mipssim/sim_time.c

index 0cea932..5492c42 100644 (file)
@@ -89,13 +89,13 @@ unsigned __cpuinit get_c0_compare_int(void)
        if (cpu_has_veic) {
                set_vi_handler(MSC01E_INT_CPUCTR, mips_timer_dispatch);
                mips_cpu_timer_irq = MSC01E_INT_BASE + MSC01E_INT_CPUCTR;
-       } else {
-#endif
-              {
-               if (cpu_has_vint)
-                       set_vi_handler(cp0_compare_irq, mips_timer_dispatch);
-               mips_cpu_timer_irq = MIPS_CPU_IRQ_BASE + cp0_compare_irq;
+
+               return mips_cpu_timer_irq;
        }
+#endif
+       if (cpu_has_vint)
+               set_vi_handler(cp0_compare_irq, mips_timer_dispatch);
+       mips_cpu_timer_irq = MIPS_CPU_IRQ_BASE + cp0_compare_irq;
 
        return mips_cpu_timer_irq;
 }