[PATCH] bitops: hweight() related cleanup

By defining generic hweight*() routines

- hweight64() will be defined on all architectures
- hweight_long() will use architecture optimized hweight32() or hweight64()

I found two possible cleanups by these reasons.

Signed-off-by: Akinobu Mita <mita@miraclelinux.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 1 insertions, 2 deletions

diff --git a/drivers/ieee1394/highlevel.c b/drivers/ieee1394/highlevel.c
index 734b121a0554..491e6032bdec 100644
--- a/drivers/ieee1394/highlevel.c
+++ b/drivers/ieee1394/highlevel.c
@@ -306,8 +306,7 @@ u64 hpsb_allocate_and_register_addrspace(struct hpsb_highlevel *hl,
         u64 align_mask = ~(alignment - 1);
 
         if ((alignment & 3) || (alignment > 0x800000000000ULL) ||
-            ((hweight32(alignment >> 32) +
-              hweight32(alignment & 0xffffffff) != 1))) {
+            (hweight64(alignment) != 1)) {
                 HPSB_ERR("%s called with invalid alignment: 0x%048llx",
                          __FUNCTION__, (unsigned long long)alignment);
                 return retval;