yaffs: More clean up

[yaffs2.git] / yaffs_checkptrw.c

diff --git a/yaffs_checkptrw.c b/yaffs_checkptrw.c
index 82d68744cf235b27216caacc6e3ec9037e200363..299130539b2b6fd15b20adbde67d99955260e57d 100644 (file)
--- a/yaffs_checkptrw.c
+++ b/yaffs_checkptrw.c
@@ -14,7 +14,7 @@
 #include "yaffs_checkptrw.h"
 #include "yaffs_getblockinfo.h"
 
-static int yaffs2_checkpt_space_ok(yaffs_dev_t *dev)
+static int yaffs2_checkpt_space_ok(struct yaffs_dev *dev)
 {
        int blocks_avail = dev->n_erased_blocks - dev->param.n_reserved_blocks;
 
@@ -26,7 +26,7 @@ static int yaffs2_checkpt_space_ok(yaffs_dev_t *dev)
 }
 
 
-static int yaffs_checkpt_erase(yaffs_dev_t *dev)
+static int yaffs_checkpt_erase(struct yaffs_dev *dev)
 {
        int i;
 
@@ -36,7 +36,7 @@ static int yaffs_checkpt_erase(yaffs_dev_t *dev)
                dev->internal_start_block, dev->internal_end_block));
 
        for (i = dev->internal_start_block; i <= dev->internal_end_block; i++) {
-               yaffs_block_info_t *bi = yaffs_get_block_info(dev, i);
+               struct yaffs_block_info *bi = yaffs_get_block_info(dev, i);
                if (bi->block_state == YAFFS_BLOCK_STATE_CHECKPOINT) {
                        T(YAFFS_TRACE_CHECKPOINT, (TSTR("erasing checkpt block %d"TENDSTR), i));
 
@@ -59,7 +59,7 @@ static int yaffs_checkpt_erase(yaffs_dev_t *dev)
 }
 
 
-static void yaffs2_checkpt_find_erased_block(yaffs_dev_t *dev)
+static void yaffs2_checkpt_find_erased_block(struct yaffs_dev *dev)
 {
        int  i;
        int blocks_avail = dev->n_erased_blocks - dev->param.n_reserved_blocks;
@@ -72,7 +72,7 @@ static void yaffs2_checkpt_find_erased_block(yaffs_dev_t *dev)
                        blocks_avail > 0) {
 
                for (i = dev->checkpt_next_block; i <= dev->internal_end_block; i++) {
-                       yaffs_block_info_t *bi = yaffs_get_block_info(dev, i);
+                       struct yaffs_block_info *bi = yaffs_get_block_info(dev, i);
                        if (bi->block_state == YAFFS_BLOCK_STATE_EMPTY) {
                                dev->checkpt_next_block = i + 1;
                                dev->checkpt_cur_block = i;
@@ -87,10 +87,10 @@ static void yaffs2_checkpt_find_erased_block(yaffs_dev_t *dev)
        dev->checkpt_cur_block = -1;
 }
 
-static void yaffs2_checkpt_find_block(yaffs_dev_t *dev)
+static void yaffs2_checkpt_find_block(struct yaffs_dev *dev)
 {
        int  i;
-       yaffs_ext_tags tags;
+       struct yaffs_ext_tags tags;
 
        T(YAFFS_TRACE_CHECKPOINT, (TSTR("find next checkpt block: start:  blocks %d next %d" TENDSTR),
                dev->blocks_in_checkpt, dev->checkpt_next_block));
@@ -123,7 +123,7 @@ static void yaffs2_checkpt_find_block(yaffs_dev_t *dev)
 }
 
 
-int yaffs2_checkpt_open(yaffs_dev_t *dev, int writing)
+int yaffs2_checkpt_open(struct yaffs_dev *dev, int writing)
 {
 
 
@@ -177,20 +177,20 @@ int yaffs2_checkpt_open(yaffs_dev_t *dev, int writing)
        return 1;
 }
 
-int yaffs2_get_checkpt_sum(yaffs_dev_t *dev, __u32 *sum)
+int yaffs2_get_checkpt_sum(struct yaffs_dev *dev, u32 *sum)
 {
-       __u32 composite_sum;
+       u32 composite_sum;
        composite_sum =  (dev->checkpt_sum << 8) | (dev->checkpt_xor & 0xFF);
        *sum = composite_sum;
        return 1;
 }
 
-static int yaffs2_checkpt_flush_buffer(yaffs_dev_t *dev)
+static int yaffs2_checkpt_flush_buffer(struct yaffs_dev *dev)
 {
        int chunk;
        int realigned_chunk;
 
-       yaffs_ext_tags tags;
+       struct yaffs_ext_tags tags;
 
        if (dev->checkpt_cur_block < 0) {
                yaffs2_checkpt_find_erased_block(dev);
@@ -208,7 +208,7 @@ static int yaffs2_checkpt_flush_buffer(yaffs_dev_t *dev)
        if (dev->checkpt_cur_chunk == 0) {
                /* First chunk we write for the block? Set block state to
                   checkpoint */
-               yaffs_block_info_t *bi = yaffs_get_block_info(dev, dev->checkpt_cur_block);
+               struct yaffs_block_info *bi = yaffs_get_block_info(dev, dev->checkpt_cur_block);
                bi->block_state = YAFFS_BLOCK_STATE_CHECKPOINT;
                dev->blocks_in_checkpt++;
        }
@@ -238,13 +238,13 @@ static int yaffs2_checkpt_flush_buffer(yaffs_dev_t *dev)
 }
 
 
-int yaffs2_checkpt_wr(yaffs_dev_t *dev, const void *data, int n_bytes)
+int yaffs2_checkpt_wr(struct yaffs_dev *dev, const void *data, int n_bytes)
 {
        int i = 0;
        int ok = 1;
 
 
-       __u8 * data_bytes = (__u8 *)data;
+       u8 * data_bytes = (u8 *)data;
 
 
 
@@ -273,17 +273,17 @@ int yaffs2_checkpt_wr(yaffs_dev_t *dev, const void *data, int n_bytes)
        return i;
 }
 
-int yaffs2_checkpt_rd(yaffs_dev_t *dev, void *data, int n_bytes)
+int yaffs2_checkpt_rd(struct yaffs_dev *dev, void *data, int n_bytes)
 {
        int i = 0;
        int ok = 1;
-       yaffs_ext_tags tags;
+       struct yaffs_ext_tags tags;
 
 
        int chunk;
        int realigned_chunk;
 
-       __u8 *data_bytes = (__u8 *)data;
+       u8 *data_bytes = (u8 *)data;
 
        if (!dev->checkpt_buffer)
                return 0;
@@ -347,7 +347,7 @@ int yaffs2_checkpt_rd(yaffs_dev_t *dev, void *data, int n_bytes)
        return  i;
 }
 
-int yaffs_checkpt_close(yaffs_dev_t *dev)
+int yaffs_checkpt_close(struct yaffs_dev *dev)
 {
 
        if (dev->checkpt_open_write) {
@@ -357,7 +357,7 @@ int yaffs_checkpt_close(yaffs_dev_t *dev)
                int i;
                for (i = 0; i < dev->blocks_in_checkpt && dev->checkpt_block_list[i] >= 0; i++) {
                        int blk = dev->checkpt_block_list[i];
-                       yaffs_block_info_t *bi = NULL;
+                       struct yaffs_block_info *bi = NULL;
                        if( dev->internal_start_block <= blk && blk <= dev->internal_end_block)
                                bi = yaffs_get_block_info(dev, blk);
                        if (bi && bi->block_state == YAFFS_BLOCK_STATE_EMPTY)
@@ -386,7 +386,7 @@ int yaffs_checkpt_close(yaffs_dev_t *dev)
                return 0;
 }
 
-int yaffs2_checkpt_invalidate_stream(yaffs_dev_t *dev)
+int yaffs2_checkpt_invalidate_stream(struct yaffs_dev *dev)
 {
        /* Erase the checkpoint data */