Merge branch 'mainlining'

[yaffs2.git] / yaffs_getblockinfo.h

diff --git a/yaffs_getblockinfo.h b/yaffs_getblockinfo.h
index 1c43b6cdb5361307c74613c01e176230c51fe205..d87acbde997cf741996eec715f4579bc4802294b 100644 (file)
--- a/yaffs_getblockinfo.h
+++ b/yaffs_getblockinfo.h
@@ -20,13 +20,13 @@
 #include "yaffs_trace.h"
 
 /* Function to manipulate block info */
-static Y_INLINE yaffs_block_info_t *yaffs_get_block_info(yaffs_dev_t * dev, int blk)
+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));
+               yaffs_trace(YAFFS_TRACE_ERROR,
+                       "**>> yaffs: get_block_info block %d is not valid",
+                       blk);
                YBUG();
        }
        return &dev->block_info[blk - dev->internal_start_block];