]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
powerpc/mpic: Fix ambiguous else statement
authorAnton Vorontsov <avorontsov@ru.mvista.com>
Fri, 23 May 2008 18:40:00 +0000 (04:40 +1000)
committerPaul Mackerras <paulus@samba.org>
Mon, 9 Jun 2008 03:41:16 +0000 (13:41 +1000)
This fixes the following warning, introduced by commit
475ca391b490a683d66bf19999a8a7a24913f139 (mpic: Deal with bogus NIRQ
in Feature Reporting Register):

  CC      arch/powerpc/sysdev/mpic.o
arch/powerpc/sysdev/mpic.c: In function 'mpic_alloc':
arch/powerpc/sysdev/mpic.c:1146: warning: suggest explicit braces to avoid ambiguous 'else'

Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
Acked-by: Kumar Gala <galak@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
arch/powerpc/sysdev/mpic.c

index f99f81abbd5c7f4b1a0eafc6d0a99835ff2b8f20..a281341e412954dcffebf823108ac86cc3bd554a 100644 (file)
@@ -1143,13 +1143,14 @@ struct mpic * __init mpic_alloc(struct device_node *node,
        greg_feature = mpic_read(mpic->gregs, MPIC_INFO(GREG_FEATURE_0));
        mpic->num_cpus = ((greg_feature & MPIC_GREG_FEATURE_LAST_CPU_MASK)
                          >> MPIC_GREG_FEATURE_LAST_CPU_SHIFT) + 1;
-       if (isu_size == 0)
+       if (isu_size == 0) {
                if (flags & MPIC_BROKEN_FRR_NIRQS)
                        mpic->num_sources = mpic->irq_count;
                else
                        mpic->num_sources =
                                ((greg_feature & MPIC_GREG_FEATURE_LAST_SRC_MASK)
                                 >> MPIC_GREG_FEATURE_LAST_SRC_SHIFT) + 1;
+       }
 
        /* Map the per-CPU registers */
        for (i = 0; i < mpic->num_cpus; i++) {