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

Amadeusz Sławiński · geertu · commit 6f08e51cdbe0 · 2022-07-06T14:07:04.000+02:00
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
@@ -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;
 }

Original file line number	Diff line number	Diff line change
`@@ -510,7 +510,7 @@ static inline int fls(unsigned int x)`
`510`	`510`	`return 32 - cnt;`
`511`	`511`	`}`
`512`	`512`
`513`		`-static inline int __fls(int x)`
	`513`	`+static inline unsigned long __fls(unsigned long x)`
`514`	`514`	`{`
`515`	`515`	`return fls(x) - 1;`
`516`	`516`	`}`