From: Manu Abraham <abraham.manu@gmail.com>
Date: Wed, 21 Jun 2006 13:28:23 +0000 (-0300)
Subject: V4L/DVB (4173): Dprintk macro beautification
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=9500c7b05b1a618a32d49a249c28c98bcb039e35;p=linux-beck.git

V4L/DVB (4173): Dprintk macro beautification

Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
---

diff --git a/drivers/media/dvb/bt8xx/dst.c b/drivers/media/dvb/bt8xx/dst.c
index d7d3d06aa4a9..2e0c6e73d4ae 100644
--- a/drivers/media/dvb/bt8xx/dst.c
+++ b/drivers/media/dvb/bt8xx/dst.c
@@ -51,20 +51,24 @@ MODULE_PARM_DESC(dst_algo, "tuning algo: default is 0=(SW), 1=(HW)");
 #define DST_INFO		2
 #define DST_DEBUG		3
 
-#define dprintk(x, y, z, format, arg...) do {									\
-	if (z) {												\
-		if	((x > DST_ERROR) && (x > y))								\
-			printk(KERN_ERR "dst(%d) %s: " format "\n", state->bt->nr, __FUNCTION__ , ##arg);	\
-		else if	((x > DST_NOTICE) && (x > y))								\
-			printk(KERN_NOTICE "dst(%d) %s: " format "\n", state->bt->nr, __FUNCTION__ , ##arg);	\
-		else if ((x > DST_INFO) && (x > y))								\
-			printk(KERN_INFO "dst(%d) %s: " format "\n", state->bt->nr, __FUNCTION__ , ##arg);	\
-		else if ((x > DST_DEBUG) && (x > y))								\
-			printk(KERN_DEBUG "dst(%d) %s: " format "\n",state->bt->nr,  __FUNCTION__ , ##arg);	\
-	} else {												\
-		if (x > y)											\
-			printk(format, ##arg);									\
-	}													\
+#define dprintk(x, y, z, format, arg...) do {				\
+	if (z) {							\
+		if	((x > DST_ERROR) && (x > y))			\
+			printk(KERN_ERR "dst(%d) %s: " format "\n",	\
+				state->bt->nr, __func__ , ##arg);	\
+		else if	((x > DST_NOTICE) && (x > y))			\
+			printk(KERN_NOTICE "dst(%d) %s: " format "\n",  \
+				state->bt->nr, __func__ , ##arg);	\
+		else if ((x > DST_INFO) && (x > y))			\
+			printk(KERN_INFO "dst(%d) %s: " format "\n",	\
+				state->bt->nr, __func__ , ##arg);	\
+		else if ((x > DST_DEBUG) && (x > y))			\
+			printk(KERN_DEBUG "dst(%d) %s: " format "\n",	\
+				state->bt->nr,  __func__ , ##arg);	\
+	} else {							\
+		if (x > y)						\
+			printk(format, ##arg);				\
+	}								\
 } while(0)