1 files changed, 7 insertions, 21 deletions

diff --git a/include/net/9p/9p.h b/include/net/9p/9p.h
index 2d70b95b3b55..7184853ca360 100644
--- a/include/net/9p/9p.h
+++ b/include/net/9p/9p.h
@@ -63,30 +63,16 @@ enum p9_debug_flags {
 
 #ifdef CONFIG_NET_9P_DEBUG
 extern unsigned int p9_debug_level;
-
-#define P9_DPRINTK(level, format, arg...) \
-do {  \
-        if ((p9_debug_level & level) == level) {\
-                if (level == P9_DEBUG_9P) \
-                        printk(KERN_NOTICE "(%8.8d) " \
-                        format , task_pid_nr(current) , ## arg); \
-                else \
-                        printk(KERN_NOTICE "-- %s (%d): " \
-                        format , __func__, task_pid_nr(current) , ## arg); \
-        } \
-} while (0)
-
+__printf(3, 4)
+void _p9_debug(enum p9_debug_flags level, const char *func,
+               const char *fmt, ...);
+#define p9_debug(level, fmt, ...)                       \
+        _p9_debug(level, __func__, fmt, ##__VA_ARGS__)
 #else
-#define P9_DPRINTK(level, format, arg...)  do { } while (0)
+#define p9_debug(level, fmt, ...)                       \
+        no_printk(fmt, ##__VA_ARGS__)
 #endif
 
-
-#define P9_EPRINTK(level, format, arg...) \
-do { \
-        printk(level "9p: %s (%d): " \
-                format , __func__, task_pid_nr(current), ## arg); \
-} while (0)
-
 /**
  * enum p9_msg_t - 9P message types
  * @P9_TLERROR: not used