]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
m68k: Fix ndelay() macro
authorBoris Brezillon <boris.brezillon@free-electrons.com>
Fri, 28 Oct 2016 15:12:28 +0000 (17:12 +0200)
committerWilly Tarreau <w@1wt.eu>
Wed, 7 Jun 2017 22:46:48 +0000 (00:46 +0200)
commit3d1b965c770966423128e587ee8bdbcbd816ea8d
tree099276d7c33d90091dff7b3c171d545e1d98d113
parent07f03860aae42d0b2c38723bb91845f91422d199
m68k: Fix ndelay() macro

commit 7e251bb21ae08ca2e4fb28cc0981fac2685a8efa upstream.

The current ndelay() macro definition has an extra semi-colon at the
end of the line thus leading to a compilation error when ndelay is used
in a conditional block without curly braces like this one:

if (cond)
ndelay(t);
else
...

which, after the preprocessor pass gives:

if (cond)
m68k_ndelay(t);;
else
...

thus leading to the following gcc error:

error: 'else' without a previous 'if'

Remove this extra semi-colon.

Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Fixes: c8ee038bd1488 ("m68k: Implement ndelay() based on the existing udelay() logic")
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Willy Tarreau <w@1wt.eu>
arch/m68k/include/asm/delay.h