[media] saa7134: replace remaining occurences or printk()

Instead of using printk(), use pr_foo() macros.

Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

diff --git a/drivers/media/pci/saa7134/saa7134-i2c.c b/drivers/media/pci/saa7134/saa7134-i2c.c
index ef3c33e3757dd6253352c7c6d2144e16950f717e..d04fbdb491584a7e6604c42efb562b1b2f71258a 100644 (file)
--- a/drivers/media/pci/saa7134/saa7134-i2c.c
+++ b/drivers/media/pci/saa7134/saa7134-i2c.c
@@ -386,7 +386,7 @@ static char *i2c_devs[128] = {
        [ 0x5a >> 1 ] = "remote control",
 };
 
-static void do_i2c_scan(char *name, struct i2c_client *c)
+static void do_i2c_scan(struct i2c_client *c)
 {
        unsigned char buf;
        int i,rc;
@@ -396,8 +396,8 @@ static void do_i2c_scan(char *name, struct i2c_client *c)
                rc = i2c_master_recv(c,&buf,0);
                if (rc < 0)
                        continue;
-               printk("%s: i2c scan: found device @ 0x%x  [%s]\n",
-                      name, i << 1, i2c_devs[i] ? i2c_devs[i] : "???");
+               pr_info("i2c scan: found device @ 0x%x  [%s]\n",
+                        i << 1, i2c_devs[i] ? i2c_devs[i] : "???");
        }
 }
 
@@ -415,7 +415,7 @@ int saa7134_i2c_register(struct saa7134_dev *dev)
 
        saa7134_i2c_eeprom(dev,dev->eedata,sizeof(dev->eedata));
        if (i2c_scan)
-               do_i2c_scan(dev->name,&dev->i2c_client);
+               do_i2c_scan(&dev->i2c_client);
 
        /* Instantiate the IR receiver device, if present */
        saa7134_probe_i2c_ir(dev);

diff --git a/drivers/media/pci/saa7134/saa7134-input.c b/drivers/media/pci/saa7134/saa7134-input.c
index 89f5fcf12722692ec5638f227ce66c83d4cd33d9..c6036557b46849a83191eb2b49c4031d879659b3 100644 (file)
--- a/drivers/media/pci/saa7134/saa7134-input.c
+++ b/drivers/media/pci/saa7134/saa7134-input.c
@@ -831,8 +831,7 @@ int saa7134_input_init1(struct saa7134_dev *dev)
                break;
        }
        if (NULL == ir_codes) {
-               printk("%s: Oops: IR config error [card=%d]\n",
-                      dev->name, dev->board);
+               pr_err("Oops: IR config error [card=%d]\n", dev->board);
                return -ENODEV;
        }
 

diff --git a/drivers/media/pci/saa7134/saa7134-tvaudio.c b/drivers/media/pci/saa7134/saa7134-tvaudio.c
index 360f447bd74d0e20b84861e262d86465e6865a36..6320b64d3528f2583f322f373063903481ef2489 100644 (file)
--- a/drivers/media/pci/saa7134/saa7134-tvaudio.c
+++ b/drivers/media/pci/saa7134/saa7134-tvaudio.c
@@ -674,12 +674,11 @@ static inline int saa_dsp_wait_bit(struct saa7134_dev *dev, int bit)
        }
        while (0 == (state & bit)) {
                if (unlikely(0 == count)) {
-                       printk("%s: dsp access wait timeout [bit=%s]\n",
-                              dev->name,
-                              (bit & SAA7135_DSP_RWSTATE_WRR) ? "WRR" :
-                              (bit & SAA7135_DSP_RWSTATE_RDB) ? "RDB" :
-                              (bit & SAA7135_DSP_RWSTATE_IDA) ? "IDA" :
-                              "???");
+                       pr_err("dsp access wait timeout [bit=%s]\n",
+                                (bit & SAA7135_DSP_RWSTATE_WRR) ? "WRR" :
+                                (bit & SAA7135_DSP_RWSTATE_RDB) ? "RDB" :
+                                (bit & SAA7135_DSP_RWSTATE_IDA) ? "IDA" :
+                                "???");
                        return -EIO;
                }
                saa_wait(DSP_DELAY);