X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=yaffs_nand.c;h=557781b60fe2110401d72b7c7e2f84fc8e7b2935;hp=ee061a825c703421a751aa9ba689f5f495fffdf6;hb=6648cbf52d6695755941ff8607fd7a0cda542e05;hpb=511baf572f96c689043518d443086b8dd6751089

diff --git a/yaffs_nand.c b/yaffs_nand.c
index ee061a8..557781b 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>
@@ -61,22 +61,22 @@ int yaffs_wr_chunk_tags_nand(struct yaffs_dev *dev,
 		if (!yaffs_validate_tags(tags)) {
 			yaffs_trace(YAFFS_TRACE_ERROR,
 				"Writing uninitialised tags");
-			YBUG();
+			BUG();
 		}
 		yaffs_trace(YAFFS_TRACE_WRITE,
 			"Writing chunk %d tags %d %d",
 			nand_chunk, tags->obj_id, tags->chunk_id);
 	} else {
 		yaffs_trace(YAFFS_TRACE_ERROR, "Writing with no tags");
-		YBUG();
+		BUG();
 		return YAFFS_FAIL;
 	}
 
 	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 +84,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 +97,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)