yaffs: Fix trace ALWAYS problem and moduleconfig.h dependency

The yaffs trace macro was always tracing. Fixed by no longer forcing
ALWAYS on.

Only include moduleconfig.h if compiling out of tree.

Signed-off-by: Charles Manning <cdhmanning@gmail.com>

diff --git a/yportenv_multi.h b/yportenv_multi.h
index 4dddf63ebb2469f15429cb56f518ec6dbd023a3a..10e284e8ec7b4e0271f5837f18ef04ef9973f862 100644 (file)
--- a/yportenv_multi.h
+++ b/yportenv_multi.h
@@ -24,7 +24,9 @@
 
 #define MTD_VERSION(a, b, c) (((a) << 16) + ((b) << 8) + (c))
 
 
 #define MTD_VERSION(a, b, c) (((a) << 16) + ((b) << 8) + (c))
 

+#ifdef YAFFS_OUT_OF_TREE

 #include "moduleconfig.h"
 #include "moduleconfig.h"

+#endif

 
 #include <linux/version.h>
 #define MTD_VERSION_CODE LINUX_VERSION_CODE
 
 #include <linux/version.h>
 #define MTD_VERSION_CODE LINUX_VERSION_CODE


@@ -75,7 +77,7 @@
 #endif
 
 #define yaffs_trace(msk, fmt, ...) do { \
 #endif
 
 #define yaffs_trace(msk, fmt, ...) do { \

-       if(yaffs_trace_mask & ((msk) | YAFFS_TRACE_ALWAYS)) \
+       if(yaffs_trace_mask & (msk)) \

                printk(KERN_DEBUG "yaffs: " fmt "\n", ##__VA_ARGS__); \
 } while(0)
 
                printk(KERN_DEBUG "yaffs: " fmt "\n", ##__VA_ARGS__); \
 } while(0)
 

diff --git a/yportenv_single.h b/yportenv_single.h
index 236f5793eccfdc4d099918771d332eb5c55245a0..8183425448cde06732aa5499156c661fe1314e90 100644 (file)
--- a/yportenv_single.h
+++ b/yportenv_single.h
@@ -54,7 +54,7 @@
 #endif
 
 #define yaffs_trace(msk, fmt, ...) do { \
 #endif
 
 #define yaffs_trace(msk, fmt, ...) do { \

-       if(yaffs_trace_mask & ((msk) | YAFFS_TRACE_ALWAYS)) \
+       if(yaffs_trace_mask & (msk)) \

                printk(KERN_DEBUG "yaffs: " fmt "\n", ##__VA_ARGS__); \
 } while(0)
 
                printk(KERN_DEBUG "yaffs: " fmt "\n", ##__VA_ARGS__); \
 } while(0)