aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/saa7134
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2010-10-25 22:44:25 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-12-29 05:16:29 -0500
commitc429e7b62a54bf34c1995b45faeaeb84104f1705 (patch)
tree80470e48b437e6c8ea7d92591ea6f88519e37370 /drivers/media/video/saa7134
parent1bc25f7d6c0f353d3c73252048fe03a3d8f0e6b8 (diff)
[media] drivers/media: Removed unnecessary KERN_<level>s from dprintk uses
Converted if (debug >= 2) printk(KERN_DEBUG... to if debug >= 2) dprintk(...) Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/saa7134')
-rw-r--r--drivers/media/video/saa7134/saa7134-input.c2
-rw-r--r--drivers/media/video/saa7134/saa7134-tvaudio.c12
2 files changed, 7 insertions, 7 deletions
diff --git a/drivers/media/video/saa7134/saa7134-input.c b/drivers/media/video/saa7134/saa7134-input.c
index 46d31dfca7a3..b6c682f0acec 100644
--- a/drivers/media/video/saa7134/saa7134-input.c
+++ b/drivers/media/video/saa7134/saa7134-input.c
@@ -972,7 +972,7 @@ void saa7134_probe_i2c_ir(struct saa7134_dev *dev)
972 an existing device. Weird... 972 an existing device. Weird...
973 REVISIT: might no longer be needed */ 973 REVISIT: might no longer be needed */
974 rc = i2c_transfer(&dev->i2c_adap, &msg_msi, 1); 974 rc = i2c_transfer(&dev->i2c_adap, &msg_msi, 1);
975 dprintk(KERN_DEBUG "probe 0x%02x @ %s: %s\n", 975 dprintk("probe 0x%02x @ %s: %s\n",
976 msg_msi.addr, dev->i2c_adap.name, 976 msg_msi.addr, dev->i2c_adap.name,
977 (1 == rc) ? "yes" : "no"); 977 (1 == rc) ? "yes" : "no");
978 break; 978 break;
diff --git a/drivers/media/video/saa7134/saa7134-tvaudio.c b/drivers/media/video/saa7134/saa7134-tvaudio.c
index 3e7d2fd1688f..57e646bb48b3 100644
--- a/drivers/media/video/saa7134/saa7134-tvaudio.c
+++ b/drivers/media/video/saa7134/saa7134-tvaudio.c
@@ -550,16 +550,16 @@ static int tvaudio_thread(void *data)
550 } else if (0 != dev->last_carrier) { 550 } else if (0 != dev->last_carrier) {
551 /* no carrier -- try last detected one as fallback */ 551 /* no carrier -- try last detected one as fallback */
552 carrier = dev->last_carrier; 552 carrier = dev->last_carrier;
553 dprintk(KERN_WARNING "%s/audio: audio carrier scan failed, " 553 dprintk("audio carrier scan failed, "
554 "using %d.%03d MHz [last detected]\n", 554 "using %d.%03d MHz [last detected]\n",
555 dev->name, carrier/1000, carrier%1000); 555 carrier/1000, carrier%1000);
556 556
557 } else { 557 } else {
558 /* no carrier + no fallback -- use default */ 558 /* no carrier + no fallback -- use default */
559 carrier = default_carrier; 559 carrier = default_carrier;
560 dprintk(KERN_WARNING "%s/audio: audio carrier scan failed, " 560 dprintk("audio carrier scan failed, "
561 "using %d.%03d MHz [default]\n", 561 "using %d.%03d MHz [default]\n",
562 dev->name, carrier/1000, carrier%1000); 562 carrier/1000, carrier%1000);
563 } 563 }
564 tvaudio_setcarrier(dev,carrier,carrier); 564 tvaudio_setcarrier(dev,carrier,carrier);
565 dev->automute = 0; 565 dev->automute = 0;