aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnton Vorontsov <avorontsov@ru.mvista.com>2008-05-23 14:40:00 -0400
committerPaul Mackerras <paulus@samba.org>2008-06-08 23:41:16 -0400
commit5073e7ee8684f3997b3633a2e5fa574027f37891 (patch)
tree87e89f6c54435dc9bee7760abee620c9a500d179
parent8a3e1c670e503ddd6f6c373b307f38b783ee3a50 (diff)
powerpc/mpic: Fix ambiguous else statement
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>
-rw-r--r--arch/powerpc/sysdev/mpic.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/powerpc/sysdev/mpic.c b/arch/powerpc/sysdev/mpic.c
index f99f81abbd5c..a281341e4129 100644
--- a/arch/powerpc/sysdev/mpic.c
+++ b/arch/powerpc/sysdev/mpic.c
@@ -1143,13 +1143,14 @@ struct mpic * __init mpic_alloc(struct device_node *node,
1143 greg_feature = mpic_read(mpic->gregs, MPIC_INFO(GREG_FEATURE_0)); 1143 greg_feature = mpic_read(mpic->gregs, MPIC_INFO(GREG_FEATURE_0));
1144 mpic->num_cpus = ((greg_feature & MPIC_GREG_FEATURE_LAST_CPU_MASK) 1144 mpic->num_cpus = ((greg_feature & MPIC_GREG_FEATURE_LAST_CPU_MASK)
1145 >> MPIC_GREG_FEATURE_LAST_CPU_SHIFT) + 1; 1145 >> MPIC_GREG_FEATURE_LAST_CPU_SHIFT) + 1;
1146 if (isu_size == 0) 1146 if (isu_size == 0) {
1147 if (flags & MPIC_BROKEN_FRR_NIRQS) 1147 if (flags & MPIC_BROKEN_FRR_NIRQS)
1148 mpic->num_sources = mpic->irq_count; 1148 mpic->num_sources = mpic->irq_count;
1149 else 1149 else
1150 mpic->num_sources = 1150 mpic->num_sources =
1151 ((greg_feature & MPIC_GREG_FEATURE_LAST_SRC_MASK) 1151 ((greg_feature & MPIC_GREG_FEATURE_LAST_SRC_MASK)
1152 >> MPIC_GREG_FEATURE_LAST_SRC_SHIFT) + 1; 1152 >> MPIC_GREG_FEATURE_LAST_SRC_SHIFT) + 1;
1153 }
1153 1154
1154 /* Map the per-CPU registers */ 1155 /* Map the per-CPU registers */
1155 for (i = 0; i < mpic->num_cpus; i++) { 1156 for (i = 0; i < mpic->num_cpus; i++) {