Merge branch 'mainlining'

[yaffs2.git] / yaffs_bitmap.c

diff --git a/yaffs_bitmap.c b/yaffs_bitmap.c
index 6be9d26fae1ec58b3f0bd637f7e83ab878656560..7df42cd0066ed84aa29836948516dd130ac23b7b 100644 (file)
--- a/yaffs_bitmap.c
+++ b/yaffs_bitmap.c
@@ -90,15 +90,9 @@ int yaffs_count_chunk_bits(struct yaffs_dev *dev, int blk)
        u8 *blk_bits = yaffs_block_bits(dev, blk);
        int i;
        int n = 0;
        u8 *blk_bits = yaffs_block_bits(dev, blk);
        int i;
        int n = 0;

-       for (i = 0; i < dev->chunk_bit_stride; i++) {
-               u8 x = *blk_bits;
-               while (x) {
-                       if (x & 1)
-                               n++;
-                       x >>= 1;
-               }

 
 

-               blk_bits++;
-       }
+       for (i = 0; i < dev->chunk_bit_stride; i++, blk_bits++)
+               n += hweight8(*blk_bits);
+

        return n;
 }
        return n;
 }