yaffs: Change __uxx types to uxx

[yaffs2.git] / yaffs_nand.c

diff --git a/yaffs_nand.c b/yaffs_nand.c
index d1fe84af8cfd832ca80100c4b8aff62f42ecb439..5fee1a31f33acfa8b6c6ba28d19faf5c3ab7b2e2 100644 (file)
--- a/yaffs_nand.c
+++ b/yaffs_nand.c
@@ -18,26 +18,26 @@
 #include "yaffs_getblockinfo.h"
 
 int yaffs_rd_chunk_tags_nand(yaffs_dev_t *dev, int nand_chunk,
-                                          __u8 *buffer,
+                                          u8 *buffer,
                                           yaffs_ext_tags *tags)
 {
        int result;
-       yaffs_ext_tags localTags;
+       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 &&
@@ -53,7 +53,7 @@ int yaffs_rd_chunk_tags_nand(yaffs_dev_t *dev, int nand_chunk,
 
 int yaffs_wr_chunk_tags_nand(yaffs_dev_t *dev,
                                                   int nand_chunk,
-                                                  const __u8 *buffer,
+                                                  const u8 *buffer,
                                                   yaffs_ext_tags *tags)
 {
 
@@ -102,7 +102,7 @@ int yaffs_mark_bad(yaffs_dev_t *dev, int block_no)
 int yaffs_query_init_block_state(yaffs_dev_t *dev,
                                                 int block_no,
                                                 yaffs_block_state_t *state,
-                                                __u32 *seq_number)
+                                                u32 *seq_number)
 {
        block_no -= dev->block_offset;