yaffs: More clean up.

[yaffs2.git] / yaffs_nand.c

diff --git a/yaffs_nand.c b/yaffs_nand.c
index d1fe84af8cfd832ca80100c4b8aff62f42ecb439..d45259e462d5bdf7b377a6783ff39398225ac23e 100644 (file)
--- a/yaffs_nand.c
+++ b/yaffs_nand.c
@@ -17,33 +17,33 @@
 
 #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,
+               result = dev->param.read_chunk_tags_fn(dev, realigned_chunk, buffer,
                                                      tags);
        else
                result = yaffs_tags_compat_rd(dev,
-                                                                       realignedChunkInNAND,
+                                                                       realigned_chunk,
                                                                        buffer,
                                                                        tags);
        if (tags &&
           tags->ecc_result > YAFFS_ECC_RESULT_NO_ERROR) {
 
-               yaffs_block_info_t *bi;
+               struct yaffs_block_info *bi;
                bi = yaffs_get_block_info(dev, nand_chunk/dev->param.chunks_per_block);
                yaffs_handle_chunk_error(dev, bi);
        }
@@ -51,10 +51,10 @@ int yaffs_rd_chunk_tags_nand(yaffs_dev_t *dev, int nand_chunk,
        return result;
 }
 
-int yaffs_wr_chunk_tags_nand(yaffs_dev_t *dev,
+int yaffs_wr_chunk_tags_nand(struct yaffs_dev *dev,
                                                   int nand_chunk,
-                                                  const __u8 *buffer,
-                                                  yaffs_ext_tags *tags)
+                                                  const u8 *buffer,
+                                                  struct yaffs_ext_tags *tags)
 {
 
        dev->n_page_writes++;
@@ -88,7 +88,7 @@ int yaffs_wr_chunk_tags_nand(yaffs_dev_t *dev,
                                                                       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;
 
@@ -99,10 +99,10 @@ int yaffs_mark_bad(yaffs_dev_t *dev, int block_no)
                return yaffs_tags_compat_mark_bad(dev, block_no);
 }
 
-int yaffs_query_init_block_state(yaffs_dev_t *dev,
+int yaffs_query_init_block_state(struct yaffs_dev *dev,
                                                 int block_no,
-                                                yaffs_block_state_t *state,
-                                                __u32 *seq_number)
+                                                enum yaffs_block_state *state,
+                                                u32 *seq_number)
 {
        block_no -= dev->block_offset;
 
@@ -115,7 +115,7 @@ int yaffs_query_init_block_state(yaffs_dev_t *dev,
 }
 
 
-int yaffs_erase_block(struct yaffs_dev_s *dev,
+int yaffs_erase_block(struct yaffs_dev *dev,
                                  int flash_block)
 {
        int result;
@@ -129,7 +129,7 @@ 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)
                return dev->param.initialise_flash_fn(dev);