hfs/hfsplus: convert printks to pr_<level>

Use a more current logging style.

Add #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
hfsplus now uses "hfsplus: " for all messages.
Coalesce formats.
Prefix debugging messages too.

Signed-off-by: Joe Perches <joe@perches.com>
Cc: Vyacheslav Dubeyko <slava@dubeyko.com>
Cc: Hin-Tak Leung <htl10@users.sourceforge.net>
Cc: Christoph Hellwig <hch@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 14 insertions, 8 deletions

diff --git a/fs/hfsplus/hfsplus_fs.h b/fs/hfsplus/hfsplus_fs.h
index 910ea98e92df..60b0a3388b26 100644
--- a/fs/hfsplus/hfsplus_fs.h
+++ b/fs/hfsplus/hfsplus_fs.h
@@ -10,6 +10,12 @@
 #ifndef _LINUX_HFSPLUS_FS_H
 #define _LINUX_HFSPLUS_FS_H
 
+#ifdef pr_fmt
+#undef pr_fmt
+#endif
+
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/fs.h>
 #include <linux/mutex.h>
 #include <linux/buffer_head.h>
@@ -32,16 +38,16 @@
 #endif
 #define DBG_MASK        (0)
 
-#define hfs_dbg(flg, fmt, ...)                          \
-do {                                                    \
-        if (DBG_##flg & DBG_MASK)                       \
-                printk(KERN_DEBUG fmt, ##__VA_ARGS__);  \
+#define hfs_dbg(flg, fmt, ...)                                  \
+do {                                                            \
+        if (DBG_##flg & DBG_MASK)                               \
+                printk(KERN_DEBUG pr_fmt(fmt), ##__VA_ARGS__);  \
 } while (0)
 
-#define hfs_dbg_cont(flg, fmt, ...)                     \
-do {                                                    \
-        if (DBG_##flg & DBG_MASK)                       \
-                printk(KERN_CONT fmt, ##__VA_ARGS__);   \
+#define hfs_dbg_cont(flg, fmt, ...)                             \
+do {                                                            \
+        if (DBG_##flg & DBG_MASK)                               \
+                pr_cont(fmt, ##__VA_ARGS__);                    \
 } while (0)
 
 /* Runtime config options */