jffs2: Standardize JFFS_<LEVEL> uses

Use pr_<level> to prefix KBUILD_MODNAME via pr_fmt.

Remove obfuscating defines and use constants in pr_<level>
No need for a do {} while (0) for single statements.

Form of JFFS_<LEVEL> output changes from
"JFFS2 notice: " to "jffs2: notice: "

Added pr_fmt to xattr.c

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

3 files changed, 13 insertions, 34 deletions

diff --git a/fs/jffs2/debug.c b/fs/jffs2/debug.c
index f8a99a371508..1090eb64b90d 100644
--- a/fs/jffs2/debug.c
+++ b/fs/jffs2/debug.c
@@ -267,7 +267,7 @@ void __jffs2_dbg_superblock_counts(struct jffs2_sb_info *c)
 do {                                                                    \
         if (sz != c->sz##_size) {                                       \
                 pr_warn("%s_size mismatch counted 0x%x, c->%s_size 0x%x\n", \
-                        #sz, #sz, sz, c->sz##_size);                    \
+                        #sz, sz, #sz, c->sz##_size);                    \
                 dump = 1;                                               \
         }                                                               \
 } while (0)
diff --git a/fs/jffs2/debug.h b/fs/jffs2/debug.h
index 7782c6355a5f..4fd9be4cbc98 100644
--- a/fs/jffs2/debug.h
+++ b/fs/jffs2/debug.h
@@ -70,49 +70,26 @@ do {						\
 } 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
diff --git a/fs/jffs2/xattr.c b/fs/jffs2/xattr.c
index 3e93cdd19005..b55b803eddcb 100644
--- a/fs/jffs2/xattr.c
+++ b/fs/jffs2/xattr.c
@@ -9,6 +9,8 @@
  *
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/kernel.h>
 #include <linux/slab.h>
 #include <linux/fs.h>