X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=yaffs_bitmap.c;h=85c8c1d83c032dfcb834a29c3a0ab54765ad5d7e;hp=1769e9b47e15e6725151abf71dbca2d414be912f;hb=62003e4e28d993ae2182cb45276bc305ee656ce4;hpb=f43976eda35065890e7cf0a008e9518158eb71d6

diff --git a/yaffs_bitmap.c b/yaffs_bitmap.c
index 1769e9b..85c8c1d 100644
--- a/yaffs_bitmap.c
+++ b/yaffs_bitmap.c
@@ -17,7 +17,7 @@
  * Chunk bitmap manipulations
  */
 
-static Y_INLINE __u8 *yaffs_BlockBits(yaffs_dev_t *dev, int blk)
+static Y_INLINE __u8 *yaffs_block_bits(yaffs_dev_t *dev, int blk)
 {
 	if (blk < dev->internal_start_block || blk > dev->internal_end_block) {
 		T(YAFFS_TRACE_ERROR,
@@ -42,63 +42,63 @@ void yaffs_verify_chunk_bit_id(yaffs_dev_t *dev, int blk, int chunk)
 
 void yaffs_clear_chunk_bits(yaffs_dev_t *dev, int blk)
 {
-	__u8 *blkBits = yaffs_BlockBits(dev, blk);
+	__u8 *blk_bits = yaffs_block_bits(dev, blk);
 
-	memset(blkBits, 0, dev->chunk_bit_stride);
+	memset(blk_bits, 0, dev->chunk_bit_stride);
 }
 
 void yaffs_clear_chunk_bit(yaffs_dev_t *dev, int blk, int chunk)
 {
-	__u8 *blkBits = yaffs_BlockBits(dev, blk);
+	__u8 *blk_bits = yaffs_block_bits(dev, blk);
 
 	yaffs_verify_chunk_bit_id(dev, blk, chunk);
 
-	blkBits[chunk / 8] &= ~(1 << (chunk & 7));
+	blk_bits[chunk / 8] &= ~(1 << (chunk & 7));
 }
 
 void yaffs_set_chunk_bit(yaffs_dev_t *dev, int blk, int chunk)
 {
-	__u8 *blkBits = yaffs_BlockBits(dev, blk);
+	__u8 *blk_bits = yaffs_block_bits(dev, blk);
 
 	yaffs_verify_chunk_bit_id(dev, blk, chunk);
 
-	blkBits[chunk / 8] |= (1 << (chunk & 7));
+	blk_bits[chunk / 8] |= (1 << (chunk & 7));
 }
 
 int yaffs_check_chunk_bit(yaffs_dev_t *dev, int blk, int chunk)
 {
-	__u8 *blkBits = yaffs_BlockBits(dev, blk);
+	__u8 *blk_bits = yaffs_block_bits(dev, blk);
 	yaffs_verify_chunk_bit_id(dev, blk, chunk);
 
-	return (blkBits[chunk / 8] & (1 << (chunk & 7))) ? 1 : 0;
+	return (blk_bits[chunk / 8] & (1 << (chunk & 7))) ? 1 : 0;
 }
 
 int yaffs_still_some_chunks(yaffs_dev_t *dev, int blk)
 {
-	__u8 *blkBits = yaffs_BlockBits(dev, blk);
+	__u8 *blk_bits = yaffs_block_bits(dev, blk);
 	int i;
 	for (i = 0; i < dev->chunk_bit_stride; i++) {
-		if (*blkBits)
+		if (*blk_bits)
 			return 1;
-		blkBits++;
+		blk_bits++;
 	}
 	return 0;
 }
 
 int yaffs_count_chunk_bits(yaffs_dev_t *dev, int blk)
 {
-	__u8 *blkBits = yaffs_BlockBits(dev, 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 = *blkBits;
+		__u8 x = *blk_bits;
 		while (x) {
 			if (x & 1)
 				n++;
 			x >>= 1;
 		}
 
-		blkBits++;
+		blk_bits++;
 	}
 	return n;
 }