xen/blkback: Make the DPRINTK uniform.

Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>

diff --git a/drivers/block/xen-blkback/common.h b/drivers/block/xen-blkback/common.h
index e37dcf7..46e5d06 100644 (file)
--- a/drivers/block/xen-blkback/common.h
+++ b/drivers/block/xen-blkback/common.h
@@ -42,9 +42,9 @@
 #include <xen/grant_table.h>
 #include <xen/xenbus.h>
 
-#define DPRINTK(_f, _a...)                     \
-       pr_debug("(file=%s, line=%d) " _f,      \
-                __FILE__ , __LINE__ , ## _a)
+#define DPRINTK(fmt, args...)                          \
+       pr_debug("xen-blkback: (%s:%d) " fmt ".\n",     \
+                __func__, __LINE__, ##args)
 
 struct vbd {
        /* What the domain refers to this vbd as. */

diff --git a/drivers/block/xen-blkback/xenbus.c b/drivers/block/xen-blkback/xenbus.c
index c86519c..fa01dbb 100644 (file)
--- a/drivers/block/xen-blkback/xenbus.c
+++ b/drivers/block/xen-blkback/xenbus.c
@@ -21,11 +21,6 @@
 #include <xen/grant_table.h>
 #include "common.h"
 
-#undef DPRINTK
-#define DPRINTK(fmt, args...)                          \
-       pr_debug("xen-blkback: (%s:%d) " fmt ".\n",     \
-                __func__, __LINE__, ##args)
-
 struct backend_info {
        struct xenbus_device    *dev;
        struct blkif_st         *blkif;