[PATCH] [POWERPC] mpic: fix ambiguous else statement

[PATCH] [POWERPC] mpic: fix ambiguous else statement

[Anton Vorontsov]

This patch fixes 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>
---
 arch/powerpc/sysdev/mpic.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/arch/powerpc/sysdev/mpic.c b/arch/powerpc/sysdev/mpic.c
index f99f81a..a281341 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,
 	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++) {
-- 
1.5.5.1

Re: [PATCH] [POWERPC] mpic: fix ambiguous else statement

[Kumar Gala]

On May 23, 2008, at 9:15 AM, Anton Vorontsov wrote:

> This patch fixes following warning introduced by
> commit 475ca391b490a683d66bf19999a8a7a24913f139 (mpic: Deal with =20
> bogus NIRQ
> in Feature Reporting Register):
>
>  CC      arch/powerpc/sysdev/mpic.o
> arch/powerpc/sysdev/mpic.c: In function =E2=80=98mpic_alloc=E2=80=99:
> arch/powerpc/sysdev/mpic.c:1146: warning: suggest explicit braces to =20=

> avoid ambiguous =E2=80=98else=E2=80=99
>
> Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>

Acked-by: Kumar Gala <galak@kernel.crashing.org>

as pointed at to me if you set LANG=3DC in your environment gcc will =20
stop spitting out the funny chars.

- k

[PATCH v2] [POWERPC] mpic: fix ambiguous else statement

[Anton Vorontsov]

This patch fixes 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>
---

On Fri, May 23, 2008 at 12:56:08PM -0500, Kumar Gala wrote:
>
> On May 23, 2008, at 9:15 AM, Anton Vorontsov wrote:
>
>> This patch fixes 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>
>
> as pointed at to me if you set LANG=C in your environment gcc will stop 
> spitting out the funny chars.

Ok, resending with Ack and non-unicode gcc warning. Also Cc'ing Paul
(forgot last time).

 arch/powerpc/sysdev/mpic.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/arch/powerpc/sysdev/mpic.c b/arch/powerpc/sysdev/mpic.c
index f99f81a..a281341 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,
 	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++) {
-- 
1.5.5.1