Skip to content

Commit 7e251bb

Browse files
Boris Brezillongeertu
authored andcommitted
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 <[email protected]> Fixes: c8ee038 ("m68k: Implement ndelay() based on the existing udelay() logic") Signed-off-by: Geert Uytterhoeven <[email protected]>
1 parent 955fe2a commit 7e251bb

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

arch/m68k/include/asm/delay.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,6 @@ static inline void __udelay(unsigned long usecs)
114114
*/
115115
#define HZSCALE (268435456 / (1000000 / HZ))
116116

117-
#define ndelay(n) __delay(DIV_ROUND_UP((n) * ((((HZSCALE) >> 11) * (loops_per_jiffy >> 11)) >> 6), 1000));
117+
#define ndelay(n) __delay(DIV_ROUND_UP((n) * ((((HZSCALE) >> 11) * (loops_per_jiffy >> 11)) >> 6), 1000))
118118

119119
#endif /* defined(_M68K_DELAY_H) */

0 commit comments

Comments
 (0)