Get timothy quick tests building cleanly.

[yaffs2.git] / yaffs_bitmap.c

diff --git a/yaffs_bitmap.c b/yaffs_bitmap.c
index 7df42cd0066ed84aa29836948516dd130ac23b7b..bf8cbb3defaec15beb2535755faa92834356897c 100644 (file)
--- a/yaffs_bitmap.c
+++ b/yaffs_bitmap.c
@@ -1,7 +1,7 @@
 /*
  * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
  *
- * Copyright (C) 2002-2010 Aleph One Ltd.
+ * Copyright (C) 2002-2011 Aleph One Ltd.
  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>
@@ -19,11 +19,12 @@
 
 static inline u8 *yaffs_block_bits(struct yaffs_dev *dev, int blk)
 {
-       if (blk < dev->internal_start_block || blk > dev->internal_end_block) {
+       if (blk < (int)dev->internal_start_block ||
+           blk > (int)dev->internal_end_block) {
                yaffs_trace(YAFFS_TRACE_ERROR,
                        "BlockBits block %d is not valid",
                        blk);
-               YBUG();
+               BUG();
        }
        return dev->chunk_bits +
            (dev->chunk_bit_stride * (blk - dev->internal_start_block));
@@ -31,12 +32,13 @@ static inline u8 *yaffs_block_bits(struct yaffs_dev *dev, int blk)
 
 void yaffs_verify_chunk_bit_id(struct yaffs_dev *dev, int blk, int chunk)
 {
-       if (blk < dev->internal_start_block || blk > dev->internal_end_block ||
-           chunk < 0 || chunk >= dev->param.chunks_per_block) {
+       if (blk < (int)dev->internal_start_block ||
+           blk > (int)dev->internal_end_block ||
+           chunk < 0 || chunk >= (int)dev->param.chunks_per_block) {
                yaffs_trace(YAFFS_TRACE_ERROR,
                        "Chunk Id (%d:%d) invalid",
                        blk, chunk);
-               YBUG();
+               BUG();
        }
 }
 
@@ -52,7 +54,6 @@ void yaffs_clear_chunk_bit(struct yaffs_dev *dev, int blk, int chunk)
        u8 *blk_bits = yaffs_block_bits(dev, blk);
 
        yaffs_verify_chunk_bit_id(dev, blk, chunk);
-
        blk_bits[chunk / 8] &= ~(1 << (chunk & 7));
 }
 
@@ -61,15 +62,14 @@ void yaffs_set_chunk_bit(struct yaffs_dev *dev, int blk, int chunk)
        u8 *blk_bits = yaffs_block_bits(dev, blk);
 
        yaffs_verify_chunk_bit_id(dev, blk, chunk);
-
        blk_bits[chunk / 8] |= (1 << (chunk & 7));
 }
 
 int yaffs_check_chunk_bit(struct yaffs_dev *dev, int blk, int chunk)
 {
        u8 *blk_bits = yaffs_block_bits(dev, blk);
-       yaffs_verify_chunk_bit_id(dev, blk, chunk);
 
+       yaffs_verify_chunk_bit_id(dev, blk, chunk);
        return (blk_bits[chunk / 8] & (1 << (chunk & 7))) ? 1 : 0;
 }
 
@@ -77,6 +77,7 @@ int yaffs_still_some_chunks(struct yaffs_dev *dev, int blk)
 {
        u8 *blk_bits = yaffs_block_bits(dev, blk);
        int i;
+
        for (i = 0; i < dev->chunk_bit_stride; i++) {
                if (*blk_bits)
                        return 1;