Merge tag 'xfs-for-linus-v3.14-rc1-2' of git://oss.sgi.com/xfs/xfs

[~andy/linux] / drivers / staging / wlags49_h2 / debug.h

diff --git a/drivers/staging/wlags49_h2/debug.h b/drivers/staging/wlags49_h2/debug.h
index b738104a9b69a630ed671f02057b5b8286fea763..40f6a3ee7408a01c0a4283a120a091ee8d262713 100644 (file)
--- a/drivers/staging/wlags49_h2/debug.h
+++ b/drivers/staging/wlags49_h2/debug.h
@@ -83,7 +83,8 @@
    the types of messages displayed */
 #ifndef DBG_LVL
 #define DBG_LVL 5                      /* yields nothing via init_module,
-                                                          original value of 5 yields DBG_TRACE_ON and DBG_VERBOSE_ON */
+                                          original value of 5 yields
+                                          DBG_TRACE_ON and DBG_VERBOSE_ON */
 #endif  /*  DBG_LVL*/
 
 
@@ -105,37 +106,16 @@
 #define DBG_LEVEL(A)        ((A)->dbgLevel)
 
 
-#ifndef PRINTK
-#   define PRINTK(S...)     printk(S)
-#endif /* PRINTK */
-
-
 #ifndef DBG_PRINT
-#   define DBG_PRINT(S...)  PRINTK(KERN_DEBUG S)
+#   define DBG_PRINT(S...)  printk(KERN_DEBUG S)
 #endif /* DBG_PRINT */
 
 
 #ifndef DBG_PRINTC
-#   define DBG_PRINTC(S...) PRINTK(S)
+#   define DBG_PRINTC(S...) printk(S)
 #endif /* DBG_PRINTC */
 
 
-#ifndef DBG_TRAP
-#   define DBG_TRAP         {}
-#endif /* DBG_TRAP */
-
-
-#define _ENTER_STR          ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>"
-#define _LEAVE_STR          "<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<"
-
-
-#define _DBG_LEAVE(A)                                          \
-       DBG_PRINT("%s:%.*s:%s\n", DBG_NAME(A), DBG_LEVEL(A)--,  \
-                 _LEAVE_STR, __func__)
-
-#define DBG_LEAVE(A)        {if (DBG_FLAGS(A) & DBG_TRACE_ON) \
-                                _DBG_LEAVE(A); }
-
 #define DBG_PARAM(A, N, F, S...)   {if (DBG_FLAGS(A) & DBG_PARAM_ON) \
                                DBG_PRINT("  %s -- "F"\n", N, S); }
 
@@ -144,7 +124,6 @@
                if (DBG_FLAGS(A) & DBG_ERROR_ON) {                      \
                        DBG_PRINT("%s:ERROR:%s ", DBG_NAME(A), __func__); \
                        DBG_PRINTC(S);                                  \
-                       DBG_TRAP;                                       \
                } } while (0)
 
 
@@ -184,24 +163,22 @@
                if (!(C)) {                                             \
                        DBG_PRINT("ASSERT(%s) -- %s#%d (%s)\n",         \
                                  #C, __FILE__, __LINE__, __func__);    \
-                       DBG_TRAP;                                       \
                } } while (0)
 
-typedef struct {
-    char           *dbgName;
-    int             dbgLevel;
-    unsigned long   DebugFlag;
-} dbg_info_t;
+struct dbg_info {
+       char            *dbgName;
+       int             dbgLevel;
+       unsigned long   DebugFlag;
+};
+
+extern struct dbg_info *DbgInfo;
 
 
 /****************************************************************************/
 #else /* DBG */
 /****************************************************************************/
 
-#define DBG_DEFN
-#define DBG_TRAP
 #define DBG_PRINT(S...)
-#define DBG_LEAVE(A)
 #define DBG_PARAM(A, N, F, S...)
 #define DBG_ERROR(A, S...)
 #define DBG_WARNING(A, S...)