2 files changed, 49 insertions, 52 deletions

diff --git a/drivers/media/video/bt832.c b/drivers/media/video/bt832.c
index d2cb5ccff56b..dda4aa6bef27 100644
--- a/drivers/media/video/bt832.c
+++ b/drivers/media/video/bt832.c
@@ -30,8 +30,9 @@
 #include <linux/init.h>
 #include <linux/errno.h>
 #include <linux/slab.h>
-
 #include <media/audiochip.h>
+#include <media/v4l2-common.h>
+
 #include "bttv.h"
 #include "bt832.h"
 
@@ -42,9 +43,10 @@ static unsigned short normal_i2c[] = { I2C_BT832_ALT1>>1, I2C_BT832_ALT2>>1,
                                        I2C_CLIENT_END };
 I2C_CLIENT_INSMOD;
 
-/* ---------------------------------------------------------------------- */
+int debug    = 0;    /* debug output */
+module_param(debug,            int, 0644);
 
-#define dprintk     if (debug) printk
+/* ---------------------------------------------------------------------- */
 
 static int bt832_detach(struct i2c_client *client);
 
@@ -61,23 +63,26 @@ int bt832_hexdump(struct i2c_client *i2c_client_s, unsigned char *buf)
         int i,rc;
         buf[0]=0x80; // start at register 0 with auto-increment
         if (1 != (rc = i2c_master_send(i2c_client_s,buf,1)))
-                printk("bt832: i2c i/o error: rc == %d (should be 1)\n",rc);
+                v4l_err(i2c_client_s,"i2c i/o error: rc == %d (should be 1)\n",rc);
 
         for(i=0;i<65;i++)
                 buf[i]=0;
         if (65 != (rc=i2c_master_recv(i2c_client_s,buf,65)))
-                printk("bt832: i2c i/o error: rc == %d (should be 65)\n",rc);
+                v4l_err(i2c_client_s,"i2c i/o error: rc == %d (should be 65)\n",rc);
 
         // Note: On READ the first byte is the current index
         //  (e.g. 0x80, what we just wrote)
 
-        if(1) {
+        if(debug>1) {
                 int i;
-                printk("BT832 hexdump:\n");
+                v4l_dbg(2,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");
+                                if(((i-1)%8)==0) printk(" ");
+                                if(((i-1)%16)==0) {
+                                        printk("\n");
+                                        v4l_dbg(2,i2c_client_s,"hexdump:");
+                                }
                         }
                         printk(" %02x",buf[i]);
                 }
@@ -96,56 +101,56 @@ int bt832_init(struct i2c_client *i2c_client_s)
         bt832_hexdump(i2c_client_s,buf);
 
         if(buf[0x40] != 0x31) {
-                printk("bt832: this i2c chip is no bt832 (id=%02x). Detaching.\n",buf[0x40]);
+                v4l_err(i2c_client_s,"This i2c chip is no bt832 (id=%02x). Detaching.\n",buf[0x40]);
                 kfree(buf);
                 return 0;
         }
 
-        printk("Write 0 tp VPSTATUS\n");
+        v4l_err(i2c_client_s,"Write 0 tp VPSTATUS\n");
         buf[0]=BT832_VP_STATUS; // Reg.52
         buf[1]= 0x00;
         if (2 != (rc = i2c_master_send(i2c_client_s,buf,2)))
-                printk("bt832: i2c i/o error VPS: rc == %d (should be 2)\n",rc);
+                v4l_err(i2c_client_s,"i2c i/o error VPS: rc == %d (should be 2)\n",rc);
 
         bt832_hexdump(i2c_client_s,buf);
 
 
         // Leave low power mode:
-        printk("Bt832: leave low power mode.\n");
+        v4l_err(i2c_client_s,"leave low power mode.\n");
         buf[0]=BT832_CAM_SETUP0; //0x39 57
         buf[1]=0x08;
         if (2 != (rc = i2c_master_send(i2c_client_s,buf,2)))
-                printk("bt832: i2c i/o error LLPM: rc == %d (should be 2)\n",rc);
+                v4l_err(i2c_client_s,"i2c i/o error LLPM: rc == %d (should be 2)\n",rc);
 
         bt832_hexdump(i2c_client_s,buf);
 
-        printk("Write 0 tp VPSTATUS\n");
+        v4l_info(i2c_client_s,"Write 0 tp VPSTATUS\n");
         buf[0]=BT832_VP_STATUS; // Reg.52
         buf[1]= 0x00;
         if (2 != (rc = i2c_master_send(i2c_client_s,buf,2)))
-                printk("bt832: i2c i/o error VPS: rc == %d (should be 2)\n",rc);
+                v4l_err(i2c_client_s,"i2c i/o error VPS: rc == %d (should be 2)\n",rc);
 
         bt832_hexdump(i2c_client_s,buf);
 
 
         // Enable Output
-        printk("Enable Output\n");
+        v4l_info(i2c_client_s,"Enable Output\n");
         buf[0]=BT832_VP_CONTROL1; // Reg.40
         buf[1]= 0x27 & (~0x01); // Default | !skip
         if (2 != (rc = i2c_master_send(i2c_client_s,buf,2)))
-                printk("bt832: i2c i/o error EO: rc == %d (should be 2)\n",rc);
+                v4l_err(i2c_client_s,"i2c i/o error EO: rc == %d (should be 2)\n",rc);
 
         bt832_hexdump(i2c_client_s,buf);
 
 
         // for testing (even works when no camera attached)
-        printk("bt832: *** Generate NTSC M Bars *****\n");
+        v4l_info(i2c_client_s,"*** Generate NTSC M Bars *****\n");
         buf[0]=BT832_VP_TESTCONTROL0; // Reg. 42
         buf[1]=3; // Generate NTSC System M bars, Generate Frame timing internally
         if (2 != (rc = i2c_master_send(i2c_client_s,buf,2)))
-                printk("bt832: i2c i/o error MBAR: rc == %d (should be 2)\n",rc);
+                v4l_info(i2c_client_s,"i2c i/o error MBAR: rc == %d (should be 2)\n",rc);
 
-        printk("Bt832: Camera Present: %s\n",
+        v4l_info(i2c_client_s,"Camera Present: %s\n",
                 (buf[1+BT832_CAM_STATUS] & BT832_56_CAMERA_PRESENT) ? "yes":"no");
 
         bt832_hexdump(i2c_client_s,buf);
@@ -159,13 +164,9 @@ static int bt832_attach(struct i2c_adapter *adap, int addr, int kind)
 {
         struct bt832 *t;
 
-        printk("bt832_attach\n");
-
         client_template.adapter = adap;
         client_template.addr    = addr;
 
-        printk("bt832: chip found @ 0x%x\n", addr<<1);
-
         if (NULL == (t = kmalloc(sizeof(*t), GFP_KERNEL)))
                 return -ENOMEM;
         memset(t,0,sizeof(*t));
@@ -173,6 +174,9 @@ static int bt832_attach(struct i2c_adapter *adap, int addr, int kind)
         i2c_set_clientdata(&t->client, t);
         i2c_attach_client(&t->client);
 
+        v4l_info(&t->client,"chip found @ 0x%x\n", addr<<1);
+
+
         if(! bt832_init(&t->client)) {
                 bt832_detach(&t->client);
                 return -1;
@@ -192,7 +196,7 @@ static int bt832_detach(struct i2c_client *client)
 {
         struct bt832 *t = i2c_get_clientdata(client);
 
-        printk("bt832: detach.\n");
+        v4l_info(&t->client,"dettach\n");
         i2c_detach_client(client);
         kfree(t);
         return 0;
@@ -203,7 +207,8 @@ bt832_command(struct i2c_client *client, unsigned int cmd, void *arg)
 {
         struct bt832 *t = i2c_get_clientdata(client);
 
-        printk("bt832: command %x\n",cmd);
+        if (debug>1)
+                v4l_i2c_print_ioctl(&t->client,cmd);
 
         switch (cmd) {
                 case BT832_HEXDUMP: {
@@ -214,7 +219,7 @@ bt832_command(struct i2c_client *client, unsigned int cmd, void *arg)
                 }
                 break;
                 case BT832_REATTACH:
-                        printk("bt832: re-attach\n");
+                        v4l_info(&t->client,"re-attach\n");
                         i2c_del_driver(&driver);
                         i2c_add_driver(&driver);
                 break;
@@ -226,9 +231,9 @@ bt832_command(struct i2c_client *client, unsigned int cmd, void *arg)
 
 static struct i2c_driver driver = {
         .driver = {
-                .name   = "i2c bt832 driver",
+                .name   = "bt832",
         },
-        .id             = -1, /* FIXME */
+        .id             = 0, /* FIXME */
         .attach_adapter = bt832_probe,
         .detach_client  = bt832_detach,
         .command        = bt832_command,
diff --git a/drivers/media/video/tda7432.c b/drivers/media/video/tda7432.c
index 3bd7dfb8cc7c..c6efc9826ba5 100644
--- a/drivers/media/video/tda7432.c
+++ b/drivers/media/video/tda7432.c
@@ -50,6 +50,7 @@
 
 #include "bttv.h"
 #include <media/audiochip.h>
+#include <media/v4l2-common.h>
 
 #ifndef VIDEO_AUDIO_BALANCE
 # define VIDEO_AUDIO_BALANCE 32
@@ -90,9 +91,6 @@ struct tda7432 {
 static struct i2c_driver driver;
 static struct i2c_client client_template;
 
-#define dprintk  if (debug) printk
-#define d2printk if (debug > 1) printk
-
 /* The TDA7432 is made by STS-Thompson
  * http://www.st.com
  * http://us.st.com/stonline/books/pdf/docs/4056.pdf
@@ -229,12 +227,12 @@ static struct i2c_client client_template;
 static int tda7432_write(struct i2c_client *client, int subaddr, int val)
 {
         unsigned char buffer[2];
-        d2printk("tda7432: In tda7432_write\n");
-        dprintk("tda7432: Writing %d 0x%x\n", subaddr, val);
+        v4l_dbg(2,client,"In tda7432_write\n");
+        v4l_dbg(1,client,"Writing %d 0x%x\n", subaddr, val);
         buffer[0] = subaddr;
         buffer[1] = val;
         if (2 != i2c_master_send(client,buffer,2)) {
-                printk(KERN_WARNING "tda7432: I/O error, trying (write %d 0x%x)\n",
+                v4l_err(client,"I/O error, trying (write %d 0x%x)\n",
                        subaddr, val);
                 return -1;
         }
@@ -247,9 +245,9 @@ static int tda7432_set(struct i2c_client *client)
 {
         struct tda7432 *t = i2c_get_clientdata(client);
         unsigned char buf[16];
-        d2printk("tda7432: In tda7432_set\n");
+        v4l_dbg(2,client,"In tda7432_set\n");
 
-        dprintk(KERN_INFO
+        v4l_dbg(1,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;
@@ -263,7 +261,7 @@ static int tda7432_set(struct i2c_client *client)
         buf[8]  = t->rr;
         buf[9]  = t->loud;
         if (10 != i2c_master_send(client,buf,10)) {
-                printk(KERN_WARNING "tda7432: I/O error, trying tda7432_set\n");
+                v4l_err(client,"I/O error, trying tda7432_set\n");
                 return -1;
         }
 
@@ -273,7 +271,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);
-        d2printk("tda7432: In tda7432_init\n");
+        v4l_dbg(2,client,"In tda7432_init\n");
 
         t->input  = TDA7432_STEREO_IN |  /* Main (stereo) input   */
                     TDA7432_BASS_SYM  |  /* Symmetric bass cut    */
@@ -301,7 +299,6 @@ static int tda7432_attach(struct i2c_adapter *adap, int addr, int kind)
 {
         struct tda7432 *t;
         struct i2c_client *client;
-        d2printk("tda7432: In tda7432_attach\n");
 
         t = kmalloc(sizeof *t,GFP_KERNEL);
         if (!t)
@@ -315,9 +312,9 @@ static int tda7432_attach(struct i2c_adapter *adap, int addr, int kind)
         i2c_set_clientdata(client, t);
 
         do_tda7432_init(client);
-        printk(KERN_INFO "tda7432: init\n");
-
         i2c_attach_client(client);
+
+        v4l_info(client, "chip found @ 0x%x (%s)\n", addr << 1, adap->name);
         return 0;
 }
 
@@ -343,7 +340,9 @@ static int tda7432_command(struct i2c_client *client,
                            unsigned int cmd, void *arg)
 {
         struct tda7432 *t = i2c_get_clientdata(client);
-        d2printk("tda7432: In tda7432_command\n");
+        v4l_dbg(2,client,"In tda7432_command\n");
+        if (debug>1)
+                v4l_i2c_print_ioctl(client,cmd);
 
         switch (cmd) {
         /* --- v4l ioctls --- */
@@ -354,7 +353,6 @@ static int tda7432_command(struct i2c_client *client,
         case VIDIOCGAUDIO:
         {
                 struct video_audio *va = arg;
-                dprintk("tda7432: VIDIOCGAUDIO\n");
 
                 va->flags |= VIDEO_AUDIO_VOLUME |
                         VIDEO_AUDIO_BASS |
@@ -409,7 +407,6 @@ static int tda7432_command(struct i2c_client *client,
         case VIDIOCSAUDIO:
         {
                 struct video_audio *va = arg;
-                dprintk("tda7432: VIDEOCSAUDIO\n");
 
                 if(va->flags & VIDEO_AUDIO_VOLUME){
                         if(!maxvol){ /* max +20db */
@@ -485,11 +482,6 @@ static int tda7432_command(struct i2c_client *client,
 
         } /* end of VIDEOCSAUDIO case */
 
-        default: /* Not VIDEOCGAUDIO or VIDEOCSAUDIO */
-
-                /* nothing */
-                d2printk("tda7432: Default\n");
-
         } /* end of (cmd) switch */
 
         return 0;
@@ -514,7 +506,7 @@ static struct i2c_client client_template =
 static int __init tda7432_init(void)
 {
         if ( (loudness < 0) || (loudness > 15) ) {
-                printk(KERN_ERR "tda7432: loudness parameter must be between 0 and 15\n");
+                printk(KERN_ERR "loudness parameter must be between 0 and 15\n");
                 return -EINVAL;
         }