1 files changed, 18 insertions, 14 deletions
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 {                                                                   \
+#define dprintk(x, y, z, format, arg...) do {                           \
-        if (z) {                                                                                                \
+        if (z) {                                                        \
-                if      ((x > DST_ERROR) && (x > y))                                                            \
+                if      ((x > DST_ERROR) && (x > y))                    \
-                        printk(KERN_ERR "dst(%d) %s: " format "\n", state->bt->nr, __FUNCTION__ , ##arg);       \
+                        printk(KERN_ERR "dst(%d) %s: " format "\n",     \
-                else if ((x > DST_NOTICE) && (x > y))                                                           \
+                                state->bt->nr, __func__ , ##arg);       \
-                        printk(KERN_NOTICE "dst(%d) %s: " format "\n", state->bt->nr, __FUNCTION__ , ##arg);    \
+                else if ((x > DST_NOTICE) && (x > y))                   \
-                else if ((x > DST_INFO) && (x > y))                                                             \
+                        printk(KERN_NOTICE "dst(%d) %s: " format "\n",  \
-                        printk(KERN_INFO "dst(%d) %s: " format "\n", state->bt->nr, __FUNCTION__ , ##arg);      \
+                                state->bt->nr, __func__ , ##arg);       \
-                else if ((x > DST_DEBUG) && (x > y))                                                            \
+                else if ((x > DST_INFO) && (x > y))                     \
-                        printk(KERN_DEBUG "dst(%d) %s: " format "\n",state->bt->nr,  __FUNCTION__ , ##arg);     \
+                        printk(KERN_INFO "dst(%d) %s: " format "\n",    \
-        } else {                                                                                                \
+                                state->bt->nr, __func__ , ##arg);       \
-                if (x > y)                                                                                      \
+                else if ((x > DST_DEBUG) && (x > y))                    \
-                        printk(format, ##arg);                                                                  \
+                        printk(KERN_DEBUG "dst(%d) %s: " format "\n",   \
-        }                                                                                                       \
+                                state->bt->nr,  __func__ , ##arg);      \
+        } else {                                                        \
+                if (x > y)                                              \
+                        printk(format, ##arg);                          \
+        }                                                               \
 } while(0)

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)");
51	#define DST_INFO 2	51	#define DST_INFO 2
52	#define DST_DEBUG 3	52	#define DST_DEBUG 3
53		53
54	#define dprintk(x, y, z, format, arg...) do { \	54	#define dprintk(x, y, z, format, arg...) do { \
55	if (z) { \	55	if (z) { \
56	if ((x > DST_ERROR) && (x > y)) \	56	if ((x > DST_ERROR) && (x > y)) \
57	printk(KERN_ERR "dst(%d) %s: " format "\n", state->bt->nr, __FUNCTION__ , ##arg); \	57	printk(KERN_ERR "dst(%d) %s: " format "\n", \
58	else if ((x > DST_NOTICE) && (x > y)) \	58	state->bt->nr, __func__ , ##arg); \
59	printk(KERN_NOTICE "dst(%d) %s: " format "\n", state->bt->nr, __FUNCTION__ , ##arg); \	59	else if ((x > DST_NOTICE) && (x > y)) \
60	else if ((x > DST_INFO) && (x > y)) \	60	printk(KERN_NOTICE "dst(%d) %s: " format "\n", \
61	printk(KERN_INFO "dst(%d) %s: " format "\n", state->bt->nr, __FUNCTION__ , ##arg); \	61	state->bt->nr, __func__ , ##arg); \
62	else if ((x > DST_DEBUG) && (x > y)) \	62	else if ((x > DST_INFO) && (x > y)) \
63	printk(KERN_DEBUG "dst(%d) %s: " format "\n",state->bt->nr, __FUNCTION__ , ##arg); \	63	printk(KERN_INFO "dst(%d) %s: " format "\n", \
64	} else { \	64	state->bt->nr, __func__ , ##arg); \
65	if (x > y) \	65	else if ((x > DST_DEBUG) && (x > y)) \
66	printk(format, ##arg); \	66	printk(KERN_DEBUG "dst(%d) %s: " format "\n", \
67	} \	67	state->bt->nr, __func__ , ##arg); \
		68	} else { \
		69	if (x > y) \
		70	printk(format, ##arg); \
		71	} \
68	} while(0)	72	} while(0)
69		73
70		74