X-Git-Url: https://yaffs.net/gitweb/?a=blobdiff_plain;f=yaffs_nand.c;h=0b59ec7e214131dd73f574610e3e315b957d25c8;hb=9a20a1043042ed312c6d076ba2369d9138354702;hp=ff9daad6eab9eb7513eb5584840c47bec36db565;hpb=f421449422a9107e857d90d306907084dad236fb;p=yaffs2.git

diff --git a/yaffs_nand.c b/yaffs_nand.c
index ff9daad..0b59ec7 100644
--- a/yaffs_nand.c
+++ b/yaffs_nand.c
@@ -1,7 +1,7 @@
 /*
  * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
  *
- * Copyright (C) 2002-2010 Aleph One Ltd.
+ * Copyright (C) 2002-2011 Aleph One Ltd.
  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>
@@ -13,7 +13,6 @@
 
 #include "yaffs_nand.h"
 #include "yaffs_tagscompat.h"
-#include "yaffs_tagsvalidity.h"
 
 #include "yaffs_getblockinfo.h"
 
@@ -58,11 +57,6 @@ int yaffs_wr_chunk_tags_nand(struct yaffs_dev *dev,
 	if (tags) {
 		tags->seq_number = dev->seq_number;
 		tags->chunk_used = 1;
-		if (!yaffs_validate_tags(tags)) {
-			yaffs_trace(YAFFS_TRACE_ERROR,
-				"Writing uninitialised tags");
-			BUG();
-		}
 		yaffs_trace(YAFFS_TRACE_WRITE,
 			"Writing chunk %d tags %d %d",
 			nand_chunk, tags->obj_id, tags->chunk_id);
@@ -75,8 +69,8 @@ int yaffs_wr_chunk_tags_nand(struct yaffs_dev *dev,
 	if (dev->param.write_chunk_tags_fn)
 		return dev->param.write_chunk_tags_fn(dev, nand_chunk, buffer,
 							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(struct yaffs_dev *dev, int block_no)
@@ -84,8 +78,8 @@ 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);
+
+	return yaffs_tags_compat_mark_bad(dev, block_no);
 }
 
 int yaffs_query_init_block_state(struct yaffs_dev *dev,
@@ -97,9 +91,8 @@ int yaffs_query_init_block_state(struct yaffs_dev *dev,
 	if (dev->param.query_block_fn)
 		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);
+
+	return yaffs_tags_compat_query_block(dev, block_no, state, seq_number);
 }
 
 int yaffs_erase_block(struct yaffs_dev *dev, int flash_block)