]> git.baikalelectronics.ru Git - kernel.git/commit
m68k: Fix ndelay() macro
authorBoris Brezillon <boris.brezillon@free-electrons.com>
Fri, 28 Oct 2016 15:12:28 +0000 (17:12 +0200)
committerGeert Uytterhoeven <geert@linux-m68k.org>
Sun, 30 Oct 2016 09:13:55 +0000 (10:13 +0100)
commit4553453b087cc9ccca3c38741687a6932d6b443c
treeced5c3baccfa048c2ddbf681a5ab24a73ce3add7
parent1c16c926f0fc625fdc9982af13eda80d2e4e6714
m68k: Fix ndelay() macro

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: a4b61c7275ae4 ("m68k: Implement ndelay() based on the existing udelay() logic")
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
arch/m68k/include/asm/delay.h