linux-mips
[Top] [All Lists]

[PATCH[MIPS] fix unbalance brace in mipssim get_c0_compare_int()

To: Ralf Baechle <ralf@linux-mips.org>
Subject: [PATCH[MIPS] fix unbalance brace in mipssim get_c0_compare_int()
From: Yoichi Yuasa <yuasa@linux-mips.org>
Date: Wed, 8 Jul 2009 15:08:19 +0900
Cc: yuasa@linux-mips.org, linux-mips <linux-mips@linux-mips.org>
Dkim-signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:sender:date:from:to:cc :subject:message-id:x-mailer:mime-version:content-type :content-transfer-encoding; bh=p3KniJ4YVUaQfKxE3clVBJiwxrIykGdRnX1uC2NwrLI=; b=fEgODQ/CPy3qtc+kczqS8dxKSRXMw0IFuG7UM66W35S505/5+Ou/U1CXZGKq3xi6XU mVfRS0mdmRZtetnOG4kDEQCY4cP9P/etDCuQM+vLd034RXLS7bcs/uoVCtjSDa9YvRyn I3DZS/f/m/qIRiL9fG9svV9rA+4XgI3saepcE=
Domainkey-signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:date:from:to:cc:subject:message-id:x-mailer:mime-version :content-type:content-transfer-encoding; b=pge3PwNH84wXbxHZBCeGZsUIb4Lk3B9Odb6eh97FV6xmjptSVK94mcGbDxW50rw5NN K1BKnKOqEWZ7mtB1t9eUl6frED3/k2fpiFEKGLpZMchxR+MlmnDUtMSfqS1zZ/I/GH2X PizSaQF3qYt6+rPcDcSe01/gdDlYFZBxQEykM=
Original-recipient: rfc822;linux-mips@linux-mips.org
Sender: linux-mips-bounce@linux-mips.org
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>

diff --git a/arch/mips/mipssim/sim_time.c b/arch/mips/mipssim/sim_time.c
index 0cea932..5492c42 100644
--- a/arch/mips/mipssim/sim_time.c
+++ b/arch/mips/mipssim/sim_time.c
@@ -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;
 }

<Prev in Thread] Current Thread [Next in Thread>