[RESEND Patch 2/2] bitops: use the same mechanism for get_count_order[_long]

From: Wei Yang
Date: Fri Aug 07 2020 - 04:59:03 EST


These two functions share the same logic.

Signed-off-by: Wei Yang <richard.weiyang@xxxxxxxxxxxxxxxxx>
---
include/linux/bitops.h | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/include/linux/bitops.h b/include/linux/bitops.h
index 030a98f0c452..5b74bdf159d6 100644
--- 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);
}

/**
--
2.20.1 (Apple Git-117)