Fixes some bad global variables

From: Mauro Carvalho Chehab <mchehab@brturbo.com.br>

- 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>

1 files changed, 8 insertions, 8 deletions

diff --git a/linux/drivers/media/video/tda7432.c b/linux/drivers/media/video/tda7432.c
index 3332d48b3..b458518a5 100644
--- a/linux/drivers/media/video/tda7432.c
+++ b/linux/drivers/media/video/tda7432.c
@@ -232,8 +232,8 @@ static struct i2c_client client_template;
 static int tda7432_write(struct i2c_client *client, int subaddr, int val)
 {
 	unsigned char buffer[2];
-	v4l_dbg(2,client,"In tda7432_write\n");
-	v4l_dbg(1,client,"Writing %d 0x%x\n", subaddr, val);
+	v4l_dbg(2, debug,client,"In tda7432_write\n");
+	v4l_dbg(1, debug,client,"Writing %d 0x%x\n", subaddr, val);
 	buffer[0] = subaddr;
 	buffer[1] = val;
 	if (2 != i2c_master_send(client,buffer,2)) {
@@ -249,12 +249,12 @@ static int tda7432_write(struct i2c_client *client, int subaddr, int val)
 static int tda7432_read(struct i2c_client *client)
 {
 	unsigned char buffer;
-	v4l_dbg(2,client,"In tda7432_read\n");
+	v4l_dbg(2, debug,client,"In tda7432_read\n");
 	if (1 != i2c_master_recv(client,&buffer,1)) {
 		v4l_err(client,"I/O error, trying (read)\n");
 		return -1;
 	}
-	v4l_dbg(1,client,"Read 0x%02x\n", buffer);
+	v4l_dbg(1, debug,client,"Read 0x%02x\n", buffer);
 	return buffer;
 }
 #endif
@@ -263,9 +263,9 @@ static int tda7432_set(struct i2c_client *client)
 {
 	struct tda7432 *t = i2c_get_clientdata(client);
 	unsigned char buf[16];
-	v4l_dbg(2,client,"In tda7432_set\n");
+	v4l_dbg(2, debug,client,"In tda7432_set\n");
 
-	v4l_dbg(1,client,
+	v4l_dbg(1, debug,client,
 		"tda7432: 7432_set(0x%02x,0x%02x,0x%02x,0x%02x,0x%02x,0x%02x,0x%02x,0x%02x,0x%02x)\n",
 		t->input,t->volume,t->bass,t->treble,t->lf,t->lr,t->rf,t->rr,t->loud);
 	buf[0]  = TDA7432_IN;
@@ -289,7 +289,7 @@ static int tda7432_set(struct i2c_client *client)
 static void do_tda7432_init(struct i2c_client *client)
 {
 	struct tda7432 *t = i2c_get_clientdata(client);
-	v4l_dbg(2,client,"In tda7432_init\n");
+	v4l_dbg(2, debug,client,"In tda7432_init\n");
 
 	t->input  = TDA7432_STEREO_IN |  /* Main (stereo) input   */
 		    TDA7432_BASS_SYM  |  /* Symmetric bass cut    */
@@ -374,7 +374,7 @@ static int tda7432_command(struct i2c_client *client,
 			   unsigned int cmd, void *arg)
 {
 	struct tda7432 *t = i2c_get_clientdata(client);
-	v4l_dbg(2,client,"In tda7432_command\n");
+	v4l_dbg(2, debug,client,"In tda7432_command\n");
 	if (debug>1)
 		v4l_i2c_print_ioctl(client,cmd);