From: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
Date: Fri, 27 May 2022 11:53:44 +0000 (+0200)
Subject: m68k: bitops: Change __fls to return and accept unsigned long
X-Git-Tag: v6.1-rc5~794^2~5
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6f08e51cdbe08370ad0a8580d0d6ea6ffdfed46d;hp=b5d263cde50a455815cd714445b71f2554c8a888;p=platform%2Fkernel%2Flinux-starfive.git

m68k: bitops: Change __fls to return and accept unsigned long

As per asm-generic definition and other architectures __fls should
return and accept unsigned long as its parameter.

No functional change is expected as return value should fit in unsigned
long.

Reviewed-by: Cezary Rojewski <cezary.rojewski@intel.com>
Signed-off-by: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
Link: https://lore.kernel.org/r/20220527115345.2588775-3-amadeuszx.slawinski@linux.intel.com
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
---

diff --git a/arch/m68k/include/asm/bitops.h b/arch/m68k/include/asm/bitops.h
index 51283db..87c2cd6 100644
--- a/arch/m68k/include/asm/bitops.h
+++ b/arch/m68k/include/asm/bitops.h
@@ -510,7 +510,7 @@ static inline int fls(unsigned int x)
 	return 32 - cnt;
 }
 
-static inline int __fls(int x)
+static inline unsigned long __fls(unsigned long x)
 {
 	return fls(x) - 1;
 }