leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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: 2791c1a439 ("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>
This commit is contained in:
Dan Carpenter
2016-11-25 14:25:54 +03:00
committed by David S. Miller
parent b5c3206190
commit 601e6e3cc5
1 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
arch/sparc/kernel/leon_kernel.c
View File

@@ -349,7 +349,8 @@ void __init leon_init_timers(void)
/* Find GPTIMER Timer Registers base address otherwise bail out. */ /* Find GPTIMER Timer Registers base address otherwise bail out. */
nnp = rootnp; nnp = rootnp;
do {
retry:
np = of_find_node_by_name(nnp, "GAISLER_GPTIMER"); np = of_find_node_by_name(nnp, "GAISLER_GPTIMER");
if (!np) { if (!np) {
np = of_find_node_by_name(nnp, "01_011"); np = of_find_node_by_name(nnp, "01_011");
@@ -365,7 +366,7 @@ void __init leon_init_timers(void)
/* Skip this instance, resource already /* Skip this instance, resource already
* allocated by other OS */ * allocated by other OS */
nnp = np; nnp = np;
continue; goto retry;
} }
} }
@@ -379,7 +380,6 @@ void __init leon_init_timers(void)
pp = of_find_property(np, "interrupts", &len); pp = of_find_property(np, "interrupts", &len);
if (pp) if (pp)
leon3_gptimer_irq = *(unsigned int *)pp->value; leon3_gptimer_irq = *(unsigned int *)pp->value;
} while (0);
if (!(leon3_gptimer_regs && leon3_irqctrl_regs && leon3_gptimer_irq)) if (!(leon3_gptimer_regs && leon3_irqctrl_regs && leon3_gptimer_irq))
goto bad; goto bad;