summaryrefslogtreecommitdiffstats
path: root/arch/m68k/include/asm/delay.h
diff options
context:
space:
mode:
authorBoris Brezillon <boris.brezillon@free-electrons.com>2016-10-28 17:12:28 +0200
committerGeert Uytterhoeven <geert@linux-m68k.org>2016-10-30 10:13:55 +0100
commit7e251bb21ae08ca2e4fb28cc0981fac2685a8efa (patch)
treeced5c3baccfa048c2ddbf681a5ab24a73ce3add7 /arch/m68k/include/asm/delay.h
parent955fe2aaed3ab64914f1a21209d8b0a5b9e920ae (diff)
downloadop-kernel-dev-7e251bb21ae08ca2e4fb28cc0981fac2685a8efa.zip
op-kernel-dev-7e251bb21ae08ca2e4fb28cc0981fac2685a8efa.tar.gz
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: c8ee038bd1488 ("m68k: Implement ndelay() based on the existing udelay() logic") Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Diffstat (limited to 'arch/m68k/include/asm/delay.h')
-rw-r--r--arch/m68k/include/asm/delay.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m68k/include/asm/delay.h b/arch/m68k/include/asm/delay.h
index d28fa8f..c598d84 100644
--- a/arch/m68k/include/asm/delay.h
+++ b/arch/m68k/include/asm/delay.h
@@ -114,6 +114,6 @@ static inline void __udelay(unsigned long usecs)
*/
#define HZSCALE (268435456 / (1000000 / HZ))
-#define ndelay(n) __delay(DIV_ROUND_UP((n) * ((((HZSCALE) >> 11) * (loops_per_jiffy >> 11)) >> 6), 1000));
+#define ndelay(n) __delay(DIV_ROUND_UP((n) * ((((HZSCALE) >> 11) * (loops_per_jiffy >> 11)) >> 6), 1000))
#endif /* defined(_M68K_DELAY_H) */
OpenPOWER on IntegriCloud