Commit 601e6e3c authored Nov 25, 2016 by Dan Carpenter Committed by David S. Miller Dec 11, 2016

sparc: leon: Fix a retry loop in leon_init_timers()



The original code causes a static checker warning because it has a
continue inside a do { } while (0); loop.  In that context, a continue
and a break are equivalent.  The intent was to go back to the start of
the loop so the continue was a bug.

I've added a retry label at the start and changed the continue to a goto
retry.  Then I removed the do { } while (0) loop and pulled the code in
one indent level.

Fixes: 2791c1a4 ("SPARC/LEON: added support for selecting Timer Core and Timer within core")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent b5c32061

arch/sparc/kernel/leon_kernel.c

+28 −28

Original line number	Diff line number	Diff line
		@@ -349,7 +349,8 @@ void __init leon_init_timers(void)

		/* Find GPTIMER Timer Registers base address otherwise bail out. */
		nnp = rootnp;
		do {

		retry:
		np = of_find_node_by_name(nnp, "GAISLER_GPTIMER");
		if (!np) {
		np = of_find_node_by_name(nnp, "01_011");
		@@ -365,7 +366,7 @@ void __init leon_init_timers(void)
		/* Skip this instance, resource already
		* allocated by other OS */
		nnp = np;
		continue;
		goto retry;
		}
		}

		@@ -379,7 +380,6 @@ void __init leon_init_timers(void)
		pp = of_find_property(np, "interrupts", &len);
		if (pp)
		leon3_gptimer_irq = (unsigned int )pp->value;
		} while (0);

		if (!(leon3_gptimer_regs && leon3_irqctrl_regs && leon3_gptimer_irq))
		goto bad;

Admin message