From af21619b17a8622ec3500ed251039da05d032dc9 Mon Sep 17 00:00:00 2001
From: Manu Abraham <abraham.manu@gmail.com>
Date: Wed, 21 Jun 2006 10:28:23 -0300
Subject: [PATCH] --- yaml --- r: 30046 b: refs/heads/master c:
 9500c7b05b1a618a32d49a249c28c98bcb039e35 h: refs/heads/master v: v3

---
 [refs]                              |  2 +-
 trunk/drivers/media/dvb/bt8xx/dst.c | 32 ++++++++++++++++-------------
 2 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/[refs] b/[refs]
index 154345532733..ae6cfef4d88f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6cd94745fb3b97fb6ecd730c0aa9d1fb4fdf9c10
+refs/heads/master: 9500c7b05b1a618a32d49a249c28c98bcb039e35
diff --git a/trunk/drivers/media/dvb/bt8xx/dst.c b/trunk/drivers/media/dvb/bt8xx/dst.c
index d7d3d06aa4a9..2e0c6e73d4ae 100644
--- a/trunk/drivers/media/dvb/bt8xx/dst.c
+++ b/trunk/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)