[PATCH] bitops: remove unnecessary assignment in fls()

From: menglong8 . dong
Date: Tue Apr 26 2022 - 04:22:29 EST


From: Menglong Dong <imagedong@xxxxxxxxxxx>

The last bits left move for the various 'x' in fls() is unnecessary,
and remove it.

Signed-off-by: Mengen Sun <mengensun@xxxxxxxxxxx>
Signed-off-by: Menglong Dong <imagedong@xxxxxxxxxxx>
---
include/asm-generic/bitops/fls.h | 4 +---
tools/include/asm-generic/bitops/fls.h | 4 +---
2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/include/asm-generic/bitops/fls.h b/include/asm-generic/bitops/fls.h
index b168bb10e1be..07e5cdfc3b98 100644
--- a/include/asm-generic/bitops/fls.h
+++ b/include/asm-generic/bitops/fls.h
@@ -32,10 +32,8 @@ static __always_inline int fls(unsigned int x)
x <<= 2;
r -= 2;
}
- if (!(x & 0x80000000u)) {
- x <<= 1;
+ if (!(x & 0x80000000u))
r -= 1;
- }
return r;
}

diff --git a/tools/include/asm-generic/bitops/fls.h b/tools/include/asm-generic/bitops/fls.h
index b168bb10e1be..07e5cdfc3b98 100644
--- a/tools/include/asm-generic/bitops/fls.h
+++ b/tools/include/asm-generic/bitops/fls.h
@@ -32,10 +32,8 @@ static __always_inline int fls(unsigned int x)
x <<= 2;
r -= 2;
}
- if (!(x & 0x80000000u)) {
- x <<= 1;
+ if (!(x & 0x80000000u))
r -= 1;
- }
return r;
}

--
2.36.0