From 1afbd730a33c6e4ca780a70351e8929dd4c40636 Mon Sep 17 00:00:00 2001
From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Date: Wed, 11 May 2011 16:15:24 -0400
Subject: [PATCH] xen/blkback: Make the DPRINTK uniform.
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
---
drivers/block/xen-blkback/common.h | 6 +++---
drivers/block/xen-blkback/xenbus.c | 5 -----
2 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/drivers/block/xen-blkback/common.h b/drivers/block/xen-blkback/common.h
index e37dcf7f6b8e..46e5d0630440 100644
--- 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 c86519c477f3..fa01dbbee0ad 100644
--- 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;