bitops: use the same mechanism for get_count_order[_long]

These two functions share the same logic. Signed-off-by: Wei Yang <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Cc: Christian Brauner <[email protected]> Cc: Andy Shevchenko <[email protected]> Link: https://lkml.kernel.org/r/[email protected] Signed-off-by: Linus Torvalds <[email protected]>
vieko · Oct 16, 2020 · 004fba1 · 004fba1
1 parent a9eb637
commit 004fba1
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/include/linux/bitops.h b/include/linux/bitops.h
@@ -188,12 +188,10 @@ static inline unsigned fls_long(unsigned long l)
 
 static inline int get_count_order(unsigned int count)
 {
-	int order;
+	if (count == 0)
+		return -1;
 
-	order = fls(count) - 1;
-	if (count & (count - 1))
-		order++;
-	return order;
+	return fls(--count);
 }
 
 /**