Messages in this thread Patch in this message | | | From | Arnd Bergmann <> | Subject | [PATCH 1/3] hexagon: fix ffz/fls/ffs return type | Date | Fri, 6 Apr 2018 16:28:21 +0200 |
| |
Let's use the same return type as the major architectures to avoid warnings like
drivers/ata/libahci_platform.c: In function 'ahci_platform_init_host': drivers/ata/libahci_platform.c:561:12: warning: comparison of distinct pointer types lacks a cast [enabled by default]
Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- arch/hexagon/include/asm/bitops.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/hexagon/include/asm/bitops.h b/arch/hexagon/include/asm/bitops.h index 5e4a59b3ec1b..8790a50b1f5e 100644 --- a/arch/hexagon/include/asm/bitops.h +++ b/arch/hexagon/include/asm/bitops.h @@ -194,7 +194,7 @@ static inline int __test_bit(int nr, const volatile unsigned long *addr) * * Undefined if no zero exists, so code should check against ~0UL first. */ -static inline long ffz(int x) +static inline int ffz(int x) { int r; @@ -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.9.0
| |