lkml.org 
[lkml]   [2018]   [Oct]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.18 53/65] hexagon: modify ffs() and fls() to return int
    Date
    From: Randy Dunlap <rdunlap@infradead.org>

    [ Upstream commit 5c41aaad409c097cf1ef74f2c649fed994744ef5 ]

    Building drivers/mtd/nand/raw/nandsim.c on arch/hexagon/ produces a
    printk format build warning. This is due to hexagon's ffs() being
    coded as returning long instead of int.

    Fix the printk format warning by changing all of hexagon's ffs() and
    fls() functions to return int instead of long. The variables that
    they return are already int instead of long. This return type
    matches the return type in <asm-generic/bitops/>.

    ../drivers/mtd/nand/raw/nandsim.c: In function 'init_nandsim':
    ../drivers/mtd/nand/raw/nandsim.c:760:2: warning: format '%u' expects argument of type 'unsigned int', but argument 2 has type 'long int' [-Wformat]

    There are no ffs() or fls() allmodconfig build errors after making this
    change.

    Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
    Cc: Richard Kuo <rkuo@codeaurora.org>
    Cc: linux-hexagon@vger.kernel.org
    Cc: Geert Uytterhoeven <geert@linux-m68k.org>
    Patch-mainline: linux-kernel @ 07/22/2018, 16:03
    Signed-off-by: Richard Kuo <rkuo@codeaurora.org>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    ---
    arch/hexagon/include/asm/bitops.h | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/arch/hexagon/include/asm/bitops.h b/arch/hexagon/include/asm/bitops.h
    index 5e4a59b3ec1b..2691a1857d20 100644
    --- a/arch/hexagon/include/asm/bitops.h
    +++ b/arch/hexagon/include/asm/bitops.h
    @@ -211,7 +211,7 @@ static inline long ffz(int x)
    * This is defined the same way as ffs.
    * Note fls(0) = 0, fls(1) = 1, fls(0x80000000) = 32.
    */
    -static inline long fls(int x)
    +static inline int fls(int x)
    {
    int r;

    @@ -232,7 +232,7 @@ static inline long fls(int x)
    * the libc and compiler builtin ffs routines, therefore
    * differs in spirit from the above ffz (man ffs).
    */
    -static inline long ffs(int x)
    +static inline int ffs(int x)
    {
    int r;

    --
    2.17.1
    \
     
     \ /
      Last update: 2018-10-01 02:51    [W:5.327 / U:0.024 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site