From: Charles Manning <cdhmanning@gmail.com>
Date: Fri, 10 Dec 2010 02:58:57 +0000 (+1300)
Subject: Merge branch 'mainlining'
X-Git-Tag: linux-mainline-patchset-4~11
X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=commitdiff_plain;h=d223baa0fa5644b48c2626f8d42b05ac45b1daf6;hp=5062df7307f71d3374da87a7c69102dc3f09da28

Merge branch 'mainlining'
---

diff --git a/yaffs_bitmap.c b/yaffs_bitmap.c
index 6be9d26..7df42cd 100644
--- 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;
-	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;
 }