X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=yaffs_nand.c;h=11eec44c9b49fcfe57c71dcbd982aca0db04f6f0;hp=d1fe84af8cfd832ca80100c4b8aff62f42ecb439;hb=976dbeae825b18e6759f3903073a6784248cc244;hpb=41573908f821bcb40750e7c069ea8f5178f630e5

diff --git a/yaffs_nand.c b/yaffs_nand.c
index d1fe84a..11eec44 100644
--- a/yaffs_nand.c
+++ b/yaffs_nand.c
@@ -17,27 +17,27 @@
 
 #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 &&
@@ -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)
+						 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);