Commit 2bb3e2ee authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab

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

Instead of using printk(), use pr_foo() macros.
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 3e0051c5
...@@ -386,7 +386,7 @@ static char *i2c_devs[128] = { ...@@ -386,7 +386,7 @@ static char *i2c_devs[128] = {
[ 0x5a >> 1 ] = "remote control", [ 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; unsigned char buf;
int i,rc; int i,rc;
...@@ -396,8 +396,8 @@ static void do_i2c_scan(char *name, struct i2c_client *c) ...@@ -396,8 +396,8 @@ static void do_i2c_scan(char *name, struct i2c_client *c)
rc = i2c_master_recv(c,&buf,0); rc = i2c_master_recv(c,&buf,0);
if (rc < 0) if (rc < 0)
continue; continue;
printk("%s: i2c scan: found device @ 0x%x [%s]\n", pr_info("i2c scan: found device @ 0x%x [%s]\n",
name, i << 1, i2c_devs[i] ? i2c_devs[i] : "???"); i << 1, i2c_devs[i] ? i2c_devs[i] : "???");
} }
} }
...@@ -415,7 +415,7 @@ int saa7134_i2c_register(struct saa7134_dev *dev) ...@@ -415,7 +415,7 @@ int saa7134_i2c_register(struct saa7134_dev *dev)
saa7134_i2c_eeprom(dev,dev->eedata,sizeof(dev->eedata)); saa7134_i2c_eeprom(dev,dev->eedata,sizeof(dev->eedata));
if (i2c_scan) if (i2c_scan)
do_i2c_scan(dev->name,&dev->i2c_client); do_i2c_scan(&dev->i2c_client);
/* Instantiate the IR receiver device, if present */ /* Instantiate the IR receiver device, if present */
saa7134_probe_i2c_ir(dev); saa7134_probe_i2c_ir(dev);
......
...@@ -831,8 +831,7 @@ int saa7134_input_init1(struct saa7134_dev *dev) ...@@ -831,8 +831,7 @@ int saa7134_input_init1(struct saa7134_dev *dev)
break; break;
} }
if (NULL == ir_codes) { if (NULL == ir_codes) {
printk("%s: Oops: IR config error [card=%d]\n", pr_err("Oops: IR config error [card=%d]\n", dev->board);
dev->name, dev->board);
return -ENODEV; return -ENODEV;
} }
......
...@@ -674,12 +674,11 @@ static inline int saa_dsp_wait_bit(struct saa7134_dev *dev, int bit) ...@@ -674,12 +674,11 @@ static inline int saa_dsp_wait_bit(struct saa7134_dev *dev, int bit)
} }
while (0 == (state & bit)) { while (0 == (state & bit)) {
if (unlikely(0 == count)) { if (unlikely(0 == count)) {
printk("%s: dsp access wait timeout [bit=%s]\n", pr_err("dsp access wait timeout [bit=%s]\n",
dev->name, (bit & SAA7135_DSP_RWSTATE_WRR) ? "WRR" :
(bit & SAA7135_DSP_RWSTATE_WRR) ? "WRR" : (bit & SAA7135_DSP_RWSTATE_RDB) ? "RDB" :
(bit & SAA7135_DSP_RWSTATE_RDB) ? "RDB" : (bit & SAA7135_DSP_RWSTATE_IDA) ? "IDA" :
(bit & SAA7135_DSP_RWSTATE_IDA) ? "IDA" : "???");
"???");
return -EIO; return -EIO;
} }
saa_wait(DSP_DELAY); saa_wait(DSP_DELAY);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment