lkml.org 
[lkml]   [2017]   [Jan]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.12 009/235] m68k: Fix ndelay() macro
    Date
    From: Boris Brezillon <boris.brezillon@free-electrons.com>

    3.12-stable review patch. If anyone has any objections, please let me know.

    ===============

    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: Jiri Slaby <jslaby@suse.cz>
    ---
    arch/m68k/include/asm/delay.h | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/arch/m68k/include/asm/delay.h b/arch/m68k/include/asm/delay.h
    index d28fa8fe26fe..c598d847d56b 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) */
    --
    2.11.0
    \
     
     \ /
      Last update: 2017-01-27 13:04    [W:3.862 / U:1.024 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site