V4L/DVB (3345): Fixes some bad global variables

- Debug global var is already used inside kernel.
- v4l_dbg now expects the debug var
- global vars inside msp34xx renamed to msp_*

Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

11 files changed, 180 insertions, 181 deletions

diff --git a/drivers/media/video/bt832.c b/drivers/media/video/bt832.c
index 361a9b6ccc..07c78f1f7a 100644
--- a/drivers/media/video/bt832.c
+++ b/drivers/media/video/bt832.c
@@ -75,13 +75,13 @@ int bt832_hexdump(struct i2c_client *i2c_client_s, unsigned char *buf)
 
         if(debug>1) {
                 int i;
-                v4l_dbg(2,i2c_client_s,"hexdump:");
+                v4l_dbg(2, debug,i2c_client_s,"hexdump:");
                 for(i=1;i<65;i++) {
                         if(i!=1) {
                                 if(((i-1)%8)==0) printk(" ");
                                 if(((i-1)%16)==0) {
                                         printk("\n");
-                                        v4l_dbg(2,i2c_client_s,"hexdump:");
+                                        v4l_dbg(2, debug,i2c_client_s,"hexdump:");
                                 }
                         }
                         printk(" %02x",buf[i]);
diff --git a/drivers/media/video/cs53l32a.c b/drivers/media/video/cs53l32a.c
index 9a66b5961d..8739c64785 100644
--- a/drivers/media/video/cs53l32a.c
+++ b/drivers/media/video/cs53l32a.c
@@ -155,7 +155,7 @@ static int cs53l32a_attach(struct i2c_adapter *adapter, int address, int kind)
         for (i = 1; i <= 7; i++) {
                 u8 v = cs53l32a_read(client, i);
 
-                v4l_dbg(1, client, "Read Reg %d %02x\n", i, v);
+                v4l_dbg(1, debug, client, "Read Reg %d %02x\n", i, v);
         }
 
         /* Set cs53l32a internal register for Adaptec 2010/2410 setup */
@@ -173,7 +173,7 @@ static int cs53l32a_attach(struct i2c_adapter *adapter, int address, int kind)
         for (i = 1; i <= 7; i++) {
                 u8 v = cs53l32a_read(client, i);
 
-                v4l_dbg(1, client, "Read Reg %d %02x\n", i, v);
+                v4l_dbg(1, debug, client, "Read Reg %d %02x\n", i, v);
         }
 
         i2c_attach_client(client);
diff --git a/drivers/media/video/cx25840/cx25840-core.c b/drivers/media/video/cx25840/cx25840-core.c
index c173476243..847b166d8b 100644
--- a/drivers/media/video/cx25840/cx25840-core.c
+++ b/drivers/media/video/cx25840/cx25840-core.c
@@ -265,7 +265,7 @@ static int set_input(struct i2c_client *client, enum cx25840_video_input vid_inp
                            vid_input <= CX25840_COMPOSITE8);
         u8 reg;
 
-        v4l_dbg(1, client, "decoder set video input %d, audio input %d\n",
+        v4l_dbg(1, debug, client, "decoder set video input %d, audio input %d\n",
                         vid_input, aud_input);
 
         if (is_composite) {
@@ -533,7 +533,7 @@ static int set_v4lfmt(struct i2c_client *client, struct v4l2_format *fmt)
                 else
                         filter = 3;
 
-                v4l_dbg(1, client, "decoder set size %dx%d -> scale  %ux%u\n",
+                v4l_dbg(1, debug, client, "decoder set size %dx%d -> scale  %ux%u\n",
                             pix->width, pix->height, HSC, VSC);
 
                 /* HSCALE=HSC */
@@ -687,13 +687,13 @@ static int cx25840_command(struct i2c_client *client, unsigned int cmd,
                 return cx25840_audio(client, cmd, arg);
 
         case VIDIOC_STREAMON:
-                v4l_dbg(1, client, "enable output\n");
+                v4l_dbg(1, debug, client, "enable output\n");
                 cx25840_write(client, 0x115, 0x8c);
                 cx25840_write(client, 0x116, 0x07);
                 break;
 
         case VIDIOC_STREAMOFF:
-                v4l_dbg(1, client, "disable output\n");
+                v4l_dbg(1, debug, client, "disable output\n");
                 cx25840_write(client, 0x115, 0x00);
                 cx25840_write(client, 0x116, 0x00);
                 break;
@@ -871,7 +871,7 @@ static int cx25840_detect_client(struct i2c_adapter *adapter, int address,
         client->driver = &i2c_driver_cx25840;
         snprintf(client->name, sizeof(client->name) - 1, "cx25840");
 
-        v4l_dbg(1, client, "detecting cx25840 client on address 0x%x\n", address << 1);
+        v4l_dbg(1, debug, client, "detecting cx25840 client on address 0x%x\n", address << 1);
 
         device_id = cx25840_read(client, 0x101) << 8;
         device_id |= cx25840_read(client, 0x100);
@@ -879,7 +879,7 @@ static int cx25840_detect_client(struct i2c_adapter *adapter, int address,
         /* The high byte of the device ID should be
          * 0x84 if chip is present */
         if ((device_id & 0xff00) != 0x8400) {
-                v4l_dbg(1, client, "cx25840 not found\n");
+                v4l_dbg(1, debug, client, "cx25840 not found\n");
                 kfree(client);
                 return 0;
         }
diff --git a/drivers/media/video/msp3400-driver.c b/drivers/media/video/msp3400-driver.c
index aa8c556b6b..9b05a0ab77 100644
--- a/drivers/media/video/msp3400-driver.c
+++ b/drivers/media/video/msp3400-driver.c
@@ -66,26 +66,26 @@ MODULE_LICENSE("GPL");
 
 /* module parameters */
 static int opmode   = OPMODE_AUTO;
-int debug    = 0;    /* debug output */
-int once     = 0;    /* no continous stereo monitoring */
-int amsound  = 0;    /* hard-wire AM sound at 6.5 Hz (france),
+int msp_debug    = 0;    /* msp_debug output */
+int msp_once     = 0;    /* no continous stereo monitoring */
+int msp_amsound  = 0;    /* hard-wire AM sound at 6.5 Hz (france),
                                the autoscan seems work well only with FM... */
-int standard = 1;    /* Override auto detect of audio standard, if needed. */
-int dolby    = 0;
+int msp_standard = 1;    /* Override auto detect of audio msp_standard, if needed. */
+int msp_dolby    = 0;
 
-int stereo_threshold = 0x190; /* a2 threshold for stereo/bilingual
+int msp_stereo_thresh = 0x190; /* a2 threshold for stereo/bilingual
                                         (msp34xxg only) 0x00a0-0x03c0 */
 
 /* read-only */
 module_param(opmode,           int, 0444);
 
 /* read-write */
-module_param(once,             bool, 0644);
-module_param(debug,            int, 0644);
-module_param(stereo_threshold, int, 0644);
-module_param(standard,         int, 0644);
-module_param(amsound,          bool, 0644);
-module_param(dolby,            bool, 0644);
+module_param_named(once,msp_once,                      bool, 0644);
+module_param_named(debug,msp_debug,                    int,  0644);
+module_param_named(stereo_threshold,msp_stereo_thresh, int,  0644);
+module_param_named(standard,msp_standard,              int,  0644);
+module_param_named(amsound,msp_amsound,                bool, 0644);
+module_param_named(dolby,msp_dolby,                    bool, 0644);
 
 MODULE_PARM_DESC(opmode, "Forces a MSP3400 opmode. 0=Manual, 1=Autodetect, 2=Autodetect and autoselect");
 MODULE_PARM_DESC(once, "No continuous stereo monitoring");
@@ -127,7 +127,7 @@ int msp_reset(struct i2c_client *client)
                 { client->addr, I2C_M_RD, 2, read  },
         };
 
-        v4l_dbg(3, client, "msp_reset\n");
+        v4l_dbg(3, msp_debug, client, "msp_reset\n");
         if (i2c_transfer(client->adapter, &reset[0], 1) != 1 ||
             i2c_transfer(client->adapter, &reset[1], 1) != 1 ||
             i2c_transfer(client->adapter, test, 2) != 2) {
@@ -165,7 +165,7 @@ static int msp_read(struct i2c_client *client, int dev, int addr)
                 return -1;
         }
         retval = read[0] << 8 | read[1];
-        v4l_dbg(3, client, "msp_read(0x%x, 0x%x): 0x%x\n", dev, addr, retval);
+        v4l_dbg(3, msp_debug, client, "msp_read(0x%x, 0x%x): 0x%x\n", dev, addr, retval);
         return retval;
 }
 
@@ -190,7 +190,7 @@ static int msp_write(struct i2c_client *client, int dev, int addr, int val)