1 files changed, 17 insertions, 33 deletions

diff --git a/fs/jffs2/debug.h b/fs/jffs2/debug.h
index c4f8eef5ca68..4fd9be4cbc98 100644
--- a/fs/jffs2/debug.h
+++ b/fs/jffs2/debug.h
@@ -51,6 +51,7 @@
  * superseded by nicer dbg_xxx() macros...
  */
 #if CONFIG_JFFS2_FS_DEBUG > 0
+#define DEBUG
 #define D1(x) x
 #else
 #define D1(x)
@@ -62,50 +63,33 @@
 #define D2(x)
 #endif
 
+#define jffs2_dbg(level, fmt, ...)              \
+do {                                            \
+        if (CONFIG_JFFS2_FS_DEBUG >= level)     \
+                pr_debug(fmt, ##__VA_ARGS__);   \
+} while (0)
+
 /* The prefixes of JFFS2 messages */
+#define JFFS2_DBG               KERN_DEBUG
 #define JFFS2_DBG_PREFIX        "[JFFS2 DBG]"
-#define JFFS2_ERR_PREFIX        "JFFS2 error:"
-#define JFFS2_WARN_PREFIX       "JFFS2 warning:"
-#define JFFS2_NOTICE_PREFIX     "JFFS2 notice:"
-
-#define JFFS2_ERR       KERN_ERR
-#define JFFS2_WARN      KERN_WARNING
-#define JFFS2_NOT       KERN_NOTICE
-#define JFFS2_DBG       KERN_DEBUG
-
 #define JFFS2_DBG_MSG_PREFIX    JFFS2_DBG JFFS2_DBG_PREFIX
-#define JFFS2_ERR_MSG_PREFIX    JFFS2_ERR JFFS2_ERR_PREFIX
-#define JFFS2_WARN_MSG_PREFIX   JFFS2_WARN JFFS2_WARN_PREFIX
-#define JFFS2_NOTICE_MSG_PREFIX JFFS2_NOT JFFS2_NOTICE_PREFIX
 
 /* JFFS2 message macros */
-#define JFFS2_ERROR(fmt, ...)                                           \
-        do {                                                            \
-                printk(JFFS2_ERR_MSG_PREFIX                             \
-                        " (%d) %s: " fmt, task_pid_nr(current),         \
-                        __func__ , ##__VA_ARGS__);                      \
-        } while(0)
+#define JFFS2_ERROR(fmt, ...)                                   \
+        pr_err("error: (%d) %s: " fmt,                          \
+               task_pid_nr(current), __func__, ##__VA_ARGS__)
 
 #define JFFS2_WARNING(fmt, ...)                                         \
-        do {                                                            \
-                printk(JFFS2_WARN_MSG_PREFIX                            \
-                        " (%d) %s: " fmt, task_pid_nr(current),         \
-                        __func__ , ##__VA_ARGS__);                      \
-        } while(0)
+        pr_warn("warning: (%d) %s: " fmt,                               \
+                task_pid_nr(current), __func__, ##__VA_ARGS__)
 
 #define JFFS2_NOTICE(fmt, ...)                                          \
-        do {                                                            \
-                printk(JFFS2_NOTICE_MSG_PREFIX                          \
-                        " (%d) %s: " fmt, task_pid_nr(current),         \
-                        __func__ , ##__VA_ARGS__);                      \
-        } while(0)
+        pr_notice("notice: (%d) %s: " fmt,                              \
+                  task_pid_nr(current), __func__, ##__VA_ARGS__)
 
 #define JFFS2_DEBUG(fmt, ...)                                           \
-        do {                                                            \
-                printk(JFFS2_DBG_MSG_PREFIX                             \
-                        " (%d) %s: " fmt, task_pid_nr(current),         \
-                        __func__ , ##__VA_ARGS__);                      \
-        } while(0)
+        printk(KERN_DEBUG "[JFFS2 DBG] (%d) %s: " fmt,                  \
+               task_pid_nr(current), __func__, ##__VA_ARGS__)
 
 /*
  * We split our debugging messages on several parts, depending on the JFFS2