linux-mips
[Top] [All Lists]

[MIPS] Fix compiler warnings in arch/mips/sibyte/bcm1480/irq.c

To: Ralf Baechle <ralf@linux-mips.org>
Subject: [MIPS] Fix compiler warnings in arch/mips/sibyte/bcm1480/irq.c
From: Martin Michlmayr <tbm@cyrius.com>
Date: Mon, 20 Feb 2006 04:57:00 +0000
Cc: linux-mips@linux-mips.org, mark.e.mason@broadcom.com
Original-recipient: rfc822;linux-mips@linux-mips.org
Sender: linux-mips-bounce@linux-mips.org
User-agent: Mutt/1.5.11
Fix the following compiler warnings:

  CC      arch/mips/sibyte/bcm1480/irq.o
arch/mips/sibyte/bcm1480/irq.c: In function ‘bcm1480_set_affinity’:
arch/mips/sibyte/bcm1480/irq.c:168: warning: ISO C90 forbids mixed declarations 
and code
arch/mips/sibyte/bcm1480/irq.c: In function ‘ack_bcm1480_irq’:
arch/mips/sibyte/bcm1480/irq.c:230: warning: ISO C90 forbids mixed declarations 
and code

Signed-off-by: Martin Michlmayr <tbm@cyrius.com>


--- a/arch/mips/sibyte/bcm1480/irq.c    2006-02-20 04:51:41.000000000 +0000
+++ b/arch/mips/sibyte/bcm1480/irq.c    2006-02-20 04:52:39.000000000 +0000
@@ -139,7 +139,7 @@
 #ifdef CONFIG_SMP
 static void bcm1480_set_affinity(unsigned int irq, cpumask_t mask)
 {
-       int i = 0, old_cpu, cpu, int_on;
+       int i = 0, old_cpu, cpu, int_on, k;
        u64 cur_ints;
        irq_desc_t *desc = irq_desc + irq;
        unsigned long flags;
@@ -165,7 +165,6 @@
                irq_dirty -= BCM1480_NR_IRQS_HALF;
        }
 
-       int k;
        for (k=0; k<2; k++) { /* Loop through high and low interrupt mask 
register */
                cur_ints = ____raw_readq(IOADDR(A_BCM1480_IMR_MAPPER(old_cpu) + 
R_BCM1480_IMR_INTERRUPT_MASK_H + (k*BCM1480_IMR_HL_SPACING)));
                int_on = !(cur_ints & (((u64) 1) << irq_dirty));
@@ -216,6 +215,7 @@
 {
        u64 pending;
        unsigned int irq_dirty;
+       int k;
 
        /*
         * If the interrupt was an HT interrupt, now is the time to
@@ -227,7 +227,6 @@
        if ((irq_dirty >= BCM1480_NR_IRQS_HALF) && (irq_dirty <= 
BCM1480_NR_IRQS)) {
                irq_dirty -= BCM1480_NR_IRQS_HALF;
        }
-       int k;
        for (k=0; k<2; k++) { /* Loop through high and low LDT interrupts */
                pending = 
__raw_readq(IOADDR(A_BCM1480_IMR_REGISTER(bcm1480_irq_owner[irq],
                                                R_BCM1480_IMR_LDT_INTERRUPT_H + 
(k*BCM1480_IMR_HL_SPACING))));


-- 
Martin Michlmayr
http://www.cyrius.com/

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