X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=yaffs_getblockinfo.h;h=e84ccf8812dbafaba8bb27e50211c0504d02f252;hp=108c361261049ac2bb6ddf0df8af3f388fcdc1f0;hb=b4ce1bb1b46accb1619dc07164ef6945feded9db;hpb=5409719091c79983abc45bcc3070bce6786c8278

diff --git a/yaffs_getblockinfo.h b/yaffs_getblockinfo.h
index 108c361..e84ccf8 100644
--- a/yaffs_getblockinfo.h
+++ b/yaffs_getblockinfo.h
@@ -1,8 +1,7 @@
 /*
  * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
  *
- * Copyright (C) 2002-2010 Aleph One Ltd.
- *   for Toby Churchill Ltd and Brightstar Engineering
+ * Copyright (C) 2002-2018 Aleph One Ltd.
  *
  * Created by Charles Manning <charles@aleph1.co.uk>
  *
@@ -20,15 +19,15 @@
 #include "yaffs_trace.h"
 
 /* Function to manipulate block info */
-static Y_INLINE struct yaffs_block_info *yaffs_get_block_info(struct yaffs_dev
+static inline struct yaffs_block_info *yaffs_get_block_info(struct yaffs_dev
 							      *dev, int blk)
 {
-	if (blk < dev->internal_start_block || blk > dev->internal_end_block) {
-		T(YAFFS_TRACE_ERROR,
-		  (TSTR
-		   ("**>> yaffs: get_block_info block %d is not valid" TENDSTR),
-		   blk));
-		YBUG();
+	if (blk < (int)dev->internal_start_block ||
+	    blk > (int)dev->internal_end_block) {
+		yaffs_trace(YAFFS_TRACE_ERROR,
+			"**>> yaffs: get_block_info block %d is not valid",
+			blk);
+		BUG();
 	}
 	return &dev->block_info[blk - dev->internal_start_block];
 }