V4L/DVB (3278): convert diagnostics over to the new v4l2-common.h macros.

- Convert diagnostics over to the new v4l2-common.h macros.
- deprecated tuner_debug option, the new option is debug.
- renamed cx25840_debug to debug.

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>

1 files changed, 6 insertions, 3 deletions

diff --git a/drivers/media/video/mt20xx.c b/drivers/media/video/mt20xx.c
index e2df722ebaeb..2c19c9588c02 100644
--- a/drivers/media/video/mt20xx.c
+++ b/drivers/media/video/mt20xx.c
@@ -20,6 +20,9 @@ module_param(tv_antenna,        int, 0644);
 static unsigned int radio_antenna = 0;
 module_param(radio_antenna,     int, 0644);
 
+/* from tuner-core.c */
+extern int debug;
+
 /* ---------------------------------------------------------------------- */
 
 #define MT2032 0x04
@@ -401,7 +404,7 @@ static void mt2050_set_if_freq(struct i2c_client *c,unsigned int freq, unsigned
         div2a=(lo2/8)-1;
         div2b=lo2-(div2a+1)*8;
 
-        if (tuner_debug > 1) {
+        if (debug > 1) {
                 tuner_dbg("lo1 lo2 = %d %d\n", lo1, lo2);
                 tuner_dbg("num1 num2 div1a div1b div2a div2b= %x %x %x %x %x %x\n",
                           num1,num2,div1a,div1b,div2a,div2b);
@@ -417,7 +420,7 @@ static void mt2050_set_if_freq(struct i2c_client *c,unsigned int freq, unsigned
         buf[5]=div2a;
         if(num2!=0) buf[5]=buf[5]|0x40;
 
-        if (tuner_debug > 1) {
+        if (debug > 1) {
                 int i;
                 tuner_dbg("bufs is: ");
                 for(i=0;i<6;i++)
@@ -505,7 +508,7 @@ int microtune_init(struct i2c_client *c)
 
         i2c_master_send(c,buf,1);
         i2c_master_recv(c,buf,21);
-        if (tuner_debug) {
+        if (debug) {
                 int i;
                 tuner_dbg("MT20xx hexdump:");
                 for(i=0;i<21;i++) {