[xen staging] xen/bitops: Drop hweight_long() and use hweightl()

[patchbot@xxxxxxx]

commit 57c8f93fc163a4a4a744aa6ee0301222a44bac4f
Author:     Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
AuthorDate: Thu Aug 22 21:37:06 2024 +0100
Commit:     Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
CommitDate: Tue Sep 3 20:22:18 2024 +0100

    xen/bitops: Drop hweight_long() and use hweightl()
    
    No functional change.
    
    Signed-off-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
    Reviewed-by: Jan Beulich <jbeulich@xxxxxxxx>
---
 xen/common/bitmap.c      | 4 ++--
 xen/include/xen/bitops.h | 5 -----
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/xen/common/bitmap.c b/xen/common/bitmap.c
index 9d9ff09f3d..3da63a32a6 100644
--- a/xen/common/bitmap.c
+++ b/xen/common/bitmap.c
@@ -191,10 +191,10 @@ unsigned int __bitmap_weight(const unsigned long *bitmap, 
unsigned int bits)
        unsigned int k, w = 0, lim = bits / BITS_PER_LONG;
 
        for (k = 0; k < lim; k++)
-               w += hweight_long(bitmap[k]);
+               w += hweightl(bitmap[k]);
 
        if (bits % BITS_PER_LONG)
-               w += hweight_long(bitmap[k] & BITMAP_LAST_WORD_MASK(bits));
+               w += hweightl(bitmap[k] & BITMAP_LAST_WORD_MASK(bits));
 
        return w;
 }
diff --git a/xen/include/xen/bitops.h b/xen/include/xen/bitops.h
index dde84443a9..ed6b9ccc72 100644
--- a/xen/include/xen/bitops.h
+++ b/xen/include/xen/bitops.h
@@ -446,11 +446,6 @@ static inline unsigned int generic_hweight64(uint64_t w)
     return (w + (w >> 32)) & 0xFF;
 }
 
-static inline unsigned int hweight_long(unsigned long w)
-{
-    return sizeof(w) == 4 ? generic_hweight32(w) : generic_hweight64(w);
-}
-
 /*
  * rol32 - rotate a 32-bit value left
  *
--
generated by git-patchbot for /home/xen/git/xen.git#staging