Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5073e7ee authored by Anton Vorontsov's avatar Anton Vorontsov Committed by Paul Mackerras
Browse files

powerpc/mpic: Fix ambiguous else statement 



This fixes the following warning, introduced by commit
475ca391 (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: default avatarAnton Vorontsov <avorontsov@ru.mvista.com>
Acked-by: default avatarKumar Gala <galak@kernel.crashing.org>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 8a3e1c67

arch/powerpc/sysdev/mpic.c

+2 −1
Original line number Diff line number Diff line
@@ -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++) {