yaffs: Clean up as per Ryan's comments

[yaffs2.git] / yaffs_tagscompat.c

diff --git a/yaffs_tagscompat.c b/yaffs_tagscompat.c
index 818f72bbc64c17ea8f47cc61133289f3c386dff1..fcd3d1780038744dab245232b8b26fcc6432bd84 100644 (file)
--- a/yaffs_tagscompat.c
+++ b/yaffs_tagscompat.c
@@ -22,7 +22,7 @@ static void yaffs_handle_rd_data_error(struct yaffs_dev *dev, int nand_chunk);
 
 /********** Tags ECC calculations  *********/
 
-void yaffs_calc_ecc(const u8 * data, struct yaffs_spare *spare)
+void yaffs_calc_ecc(const u8 *data, struct yaffs_spare *spare)
 {
        yaffs_ecc_cacl(data, spare->ecc1);
        yaffs_ecc_cacl(&data[256], spare->ecc2);
@@ -31,7 +31,6 @@ void yaffs_calc_ecc(const u8 * data, struct yaffs_spare *spare)
 void yaffs_calc_tags_ecc(struct yaffs_tags *tags)
 {
        /* Calculate an ecc */
-
        unsigned char *b = ((union yaffs_tags_union *)tags)->as_bytes;
        unsigned i, j;
        unsigned ecc = 0;
@@ -46,9 +45,7 @@ void yaffs_calc_tags_ecc(struct yaffs_tags *tags)
                                ecc ^= bit;
                }
        }
-
        tags->ecc = ecc;
-
 }
 
 int yaffs_check_tags_ecc(struct yaffs_tags *tags)
@@ -76,7 +73,6 @@ int yaffs_check_tags_ecc(struct yaffs_tags *tags)
                /* TODO Need to do somethiong here */
                return -1;      /* unrecovered error */
        }
-
        return 0;
 }
 
@@ -128,7 +124,7 @@ static void yaffs_spare_init(struct yaffs_spare *spare)
 }
 
 static int yaffs_wr_nand(struct yaffs_dev *dev,
-                        int nand_chunk, const u8 * data,
+                        int nand_chunk, const u8 *data,
                         struct yaffs_spare *spare)
 {
        if (nand_chunk < dev->param.start_block * dev->param.chunks_per_block) {
@@ -143,7 +139,7 @@ static int yaffs_wr_nand(struct yaffs_dev *dev,
 
 static int yaffs_rd_chunk_nand(struct yaffs_dev *dev,
                               int nand_chunk,
-                              u8 * data,
+                              u8 *data,
                               struct yaffs_spare *spare,
                               enum yaffs_ecc_result *ecc_result,
                               int correct_errors)
@@ -268,9 +264,8 @@ static void yaffs_handle_rd_data_error(struct yaffs_dev *dev, int nand_chunk)
        int flash_block = nand_chunk / dev->param.chunks_per_block;
 
        /* Mark the block for retirement */
-       yaffs_get_block_info(dev,
-                            flash_block + dev->block_offset)->needs_retiring =
-           1;
+       yaffs_get_block_info(dev, flash_block + dev->block_offset)->
+               needs_retiring = 1;
        yaffs_trace(YAFFS_TRACE_ERROR | YAFFS_TRACE_BAD_BLOCKS,
                "**>>Block %d marked for retirement",
                flash_block);
@@ -284,13 +279,13 @@ static void yaffs_handle_rd_data_error(struct yaffs_dev *dev, int nand_chunk)
 
 int yaffs_tags_compat_wr(struct yaffs_dev *dev,
                         int nand_chunk,
-                        const u8 * data, const struct yaffs_ext_tags *ext_tags)
+                        const u8 *data, const struct yaffs_ext_tags *ext_tags)
 {
        struct yaffs_spare spare;
        struct yaffs_tags tags;
 
        yaffs_spare_init(&spare);
-        
+
        if (ext_tags->is_deleted)
                spare.page_status = 0;
        else {
@@ -310,69 +305,61 @@ int yaffs_tags_compat_wr(struct yaffs_dev *dev,
                        yaffs_calc_ecc(data, &spare);
 
                yaffs_load_tags_to_spare(&spare, &tags);
-
        }
-
        return yaffs_wr_nand(dev, nand_chunk, data, &spare);
 }
 
 int yaffs_tags_compat_rd(struct yaffs_dev *dev,
                         int nand_chunk,
-                        u8 * data, struct yaffs_ext_tags *ext_tags)
+                        u8 *data, struct yaffs_ext_tags *ext_tags)
 {
-
        struct yaffs_spare spare;
        struct yaffs_tags tags;
        enum yaffs_ecc_result ecc_result = YAFFS_ECC_RESULT_UNKNOWN;
-
        static struct yaffs_spare spare_ff;
        static int init;
+       int deleted;
 
        if (!init) {
                memset(&spare_ff, 0xFF, sizeof(spare_ff));
                init = 1;
        }
 
-       if (yaffs_rd_chunk_nand(dev, nand_chunk, data, &spare, &ecc_result, 1)) {
-               /* ext_tags may be NULL */
-               if (ext_tags) {
-
-                       int deleted =
-                           (hweight8(spare.page_status) < 7) ? 1 : 0;
+       if (!yaffs_rd_chunk_nand(dev, nand_chunk,
+                                       data, &spare, &ecc_result, 1))
+               return YAFFS_FAIL;
 
-                       ext_tags->is_deleted = deleted;
-                       ext_tags->ecc_result = ecc_result;
-                       ext_tags->block_bad = 0;        /* We're reading it */
-                       /* therefore it is not a bad block */
-                       ext_tags->chunk_used =
-                           (memcmp(&spare_ff, &spare, sizeof(spare_ff)) !=
-                            0) ? 1 : 0;
+       /* ext_tags may be NULL */
+       if (!ext_tags)
+               return YAFFS_OK;
 
-                       if (ext_tags->chunk_used) {
-                               yaffs_get_tags_from_spare(dev, &spare, &tags);
+       deleted = (hweight8(spare.page_status) < 7) ? 1 : 0;
 
-                               ext_tags->obj_id = tags.obj_id;
-                               ext_tags->chunk_id = tags.chunk_id;
-                               ext_tags->n_bytes = tags.n_bytes_lsb;
+       ext_tags->is_deleted = deleted;
+       ext_tags->ecc_result = ecc_result;
+       ext_tags->block_bad = 0;        /* We're reading it */
+       /* therefore it is not a bad block */
+       ext_tags->chunk_used =
+               memcmp(&spare_ff, &spare, sizeof(spare_ff)) ? 1 : 0;
 
-                               if (dev->data_bytes_per_chunk >= 1024)
-                                       ext_tags->n_bytes |=
-                                           (((unsigned)tags.
-                                             n_bytes_msb) << 10);
+       if (ext_tags->chunk_used) {
+               yaffs_get_tags_from_spare(dev, &spare, &tags);
+               ext_tags->obj_id = tags.obj_id;
+               ext_tags->chunk_id = tags.chunk_id;
+               ext_tags->n_bytes = tags.n_bytes_lsb;
 
-                               ext_tags->serial_number = tags.serial_number;
-                       }
-               }
+               if (dev->data_bytes_per_chunk >= 1024)
+                       ext_tags->n_bytes |=
+                               (((unsigned)tags.n_bytes_msb) << 10);
 
-               return YAFFS_OK;
-       } else {
-               return YAFFS_FAIL;
+               ext_tags->serial_number = tags.serial_number;
        }
+
+       return YAFFS_OK;
 }
 
 int yaffs_tags_compat_mark_bad(struct yaffs_dev *dev, int flash_block)
 {
-
        struct yaffs_spare spare;
 
        memset(&spare, 0xff, sizeof(struct yaffs_spare));
@@ -385,15 +372,13 @@ int yaffs_tags_compat_mark_bad(struct yaffs_dev *dev, int flash_block)
                      NULL, &spare);
 
        return YAFFS_OK;
-
 }
 
 int yaffs_tags_compat_query_block(struct yaffs_dev *dev,
                                  int block_no,
                                  enum yaffs_block_state *state,
-                                 u32 * seq_number)
+                                 u32 *seq_number)
 {
-
        struct yaffs_spare spare0, spare1;
        static struct yaffs_spare spare_ff;
        static int init;
@@ -416,7 +401,7 @@ int yaffs_tags_compat_query_block(struct yaffs_dev *dev,
        else if (memcmp(&spare_ff, &spare0, sizeof(spare_ff)) == 0)
                *state = YAFFS_BLOCK_STATE_EMPTY;
        else
-               *state = YAFFS_BLOCK_STATE_NEEDS_SCANNING;
+               *state = YAFFS_BLOCK_STATE_NEEDS_SCAN;
 
        return YAFFS_OK;
 }