yaffs: Fix compilation issue

[yaffs2.git] / yaffs_nand.c

diff --git a/yaffs_nand.c b/yaffs_nand.c
index d1fe84af8cfd832ca80100c4b8aff62f42ecb439..25b5213a436e75e06b8bf6ee77a4061b3e333a17 100644 (file)
--- a/yaffs_nand.c
+++ b/yaffs_nand.c
@@ -17,106 +17,97 @@
 
 #include "yaffs_getblockinfo.h"
 
-int yaffs_rd_chunk_tags_nand(yaffs_dev_t *dev, int nand_chunk,
-                                          __u8 *buffer,
-                                          yaffs_ext_tags *tags)
+int yaffs_rd_chunk_tags_nand(struct yaffs_dev *dev, int nand_chunk,
+                            u8 * buffer, struct yaffs_ext_tags *tags)
 {
        int result;
-       yaffs_ext_tags localTags;
+       struct yaffs_ext_tags local_tags;
 
-       int realignedChunkInNAND = nand_chunk - dev->chunk_offset;
+       int realigned_chunk = nand_chunk - dev->chunk_offset;
 
        dev->n_page_reads++;
 
        /* If there are no tags provided, use local tags to get prioritised gc working */
        if (!tags)
-               tags = &localTags;
+               tags = &local_tags;
 
        if (dev->param.read_chunk_tags_fn)
-               result = dev->param.read_chunk_tags_fn(dev, realignedChunkInNAND, buffer,
-                                                     tags);
+               result =
+                   dev->param.read_chunk_tags_fn(dev, realigned_chunk, buffer,
+                                                 tags);
        else
                result = yaffs_tags_compat_rd(dev,
-                                                                       realignedChunkInNAND,
-                                                                       buffer,
-                                                                       tags);
-       if (tags &&
-          tags->ecc_result > YAFFS_ECC_RESULT_NO_ERROR) {
-
-               yaffs_block_info_t *bi;
-               bi = yaffs_get_block_info(dev, nand_chunk/dev->param.chunks_per_block);
+                                             realigned_chunk, buffer, tags);
+       if (tags && tags->ecc_result > YAFFS_ECC_RESULT_NO_ERROR) {
+
+               struct yaffs_block_info *bi;
+               bi = yaffs_get_block_info(dev,
+                                         nand_chunk /
+                                         dev->param.chunks_per_block);
                yaffs_handle_chunk_error(dev, bi);
        }
 
        return result;
 }
 
-int yaffs_wr_chunk_tags_nand(yaffs_dev_t *dev,
-                                                  int nand_chunk,
-                                                  const __u8 *buffer,
-                                                  yaffs_ext_tags *tags)
+int yaffs_wr_chunk_tags_nand(struct yaffs_dev *dev,
+                            int nand_chunk,
+                            const u8 * buffer, struct yaffs_ext_tags *tags)
 {
 
        dev->n_page_writes++;
 
        nand_chunk -= dev->chunk_offset;
 
-
        if (tags) {
                tags->seq_number = dev->seq_number;
                tags->chunk_used = 1;
                if (!yaffs_validate_tags(tags)) {
-                       T(YAFFS_TRACE_ERROR,
-                         (TSTR("Writing uninitialised tags" TENDSTR)));
+                       yaffs_trace(YAFFS_TRACE_ERROR, "Writing uninitialised tags");
                        YBUG();
                }
-               T(YAFFS_TRACE_WRITE,
-                 (TSTR("Writing chunk %d tags %d %d" TENDSTR), nand_chunk,
-                  tags->obj_id, tags->chunk_id));
+               yaffs_trace(YAFFS_TRACE_WRITE,
+                       "Writing chunk %d tags %d %d",
+                       nand_chunk, tags->obj_id, tags->chunk_id);
        } else {
-               T(YAFFS_TRACE_ERROR, (TSTR("Writing with no tags" TENDSTR)));
+               yaffs_trace(YAFFS_TRACE_ERROR, "Writing with no tags");
                YBUG();
+               return YAFFS_FAIL;
        }
 
        if (dev->param.write_chunk_tags_fn)
                return dev->param.write_chunk_tags_fn(dev, nand_chunk, buffer,
-                                                    tags);
+                                                     tags);
        else
-               return yaffs_tags_compat_wr(dev,
-                                                                      nand_chunk,
-                                                                      buffer,
-                                                                      tags);
+               return yaffs_tags_compat_wr(dev, nand_chunk, buffer, tags);
 }
 
-int yaffs_mark_bad(yaffs_dev_t *dev, int block_no)
+int yaffs_mark_bad(struct yaffs_dev *dev, int block_no)
 {
        block_no -= dev->block_offset;
 
-
        if (dev->param.bad_block_fn)
                return dev->param.bad_block_fn(dev, block_no);
        else
                return yaffs_tags_compat_mark_bad(dev, block_no);
 }
 
-int yaffs_query_init_block_state(yaffs_dev_t *dev,
-                                                int block_no,
-                                                yaffs_block_state_t *state,
-                                                __u32 *seq_number)
+int yaffs_query_init_block_state(struct yaffs_dev *dev,
+                                int block_no,
+                                enum yaffs_block_state *state,
+                                u32 * seq_number)
 {
        block_no -= dev->block_offset;
 
        if (dev->param.query_block_fn)
-               return dev->param.query_block_fn(dev, block_no, state, seq_number);
+               return dev->param.query_block_fn(dev, block_no, state,
+                                                seq_number);
        else
                return yaffs_tags_compat_query_block(dev, block_no,
-                                                            state,
-                                                            seq_number);
+                                                    state, seq_number);
 }
 
-
-int yaffs_erase_block(struct yaffs_dev_s *dev,
-                                 int flash_block)
+int yaffs_erase_block(struct yaffs_dev *dev, int flash_block)
 {
        int result;
 
@@ -129,12 +120,9 @@ int yaffs_erase_block(struct yaffs_dev_s *dev,
        return result;
 }
 
-int yaffs_init_nand(struct yaffs_dev_s *dev)
+int yaffs_init_nand(struct yaffs_dev *dev)
 {
-       if(dev->param.initialise_flash_fn)
+       if (dev->param.initialise_flash_fn)
                return dev->param.initialise_flash_fn(dev);
        return YAFFS_OK;
 }
-
-
-