tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

authored by

Joe Perches and committed by
Mauro Carvalho Chehab c429e7b6 1bc25f7d

+18 -25
+4 -6
drivers/media/common/tuners/max2165.c
··· 52 52 msg.addr = priv->config->i2c_address; 53 53 54 54 if (debug >= 2) 55 - printk(KERN_DEBUG "%s: reg=0x%02X, data=0x%02X\n", 56 - __func__, reg, data); 55 + dprintk("%s: reg=0x%02X, data=0x%02X\n", __func__, reg, data); 57 56 58 57 ret = i2c_transfer(priv->i2c, &msg, 1); 59 58 60 59 if (ret != 1) 61 - dprintk(KERN_DEBUG "%s: error reg=0x%x, data=0x%x, ret=%i\n", 60 + dprintk("%s: error reg=0x%x, data=0x%x, ret=%i\n", 62 61 __func__, reg, data, ret); 63 62 64 63 return (ret != 1) ? -EIO : 0; ··· 77 78 78 79 ret = i2c_transfer(priv->i2c, msg, 2); 79 80 if (ret != 2) { 80 - dprintk(KERN_DEBUG "%s: error reg=0x%x, ret=%i\n", 81 - __func__, reg, ret); 81 + dprintk("%s: error reg=0x%x, ret=%i\n", __func__, reg, ret); 82 82 return -EIO; 83 83 } 84 84 85 85 *p_data = b1[0]; 86 86 if (debug >= 2) 87 - printk(KERN_DEBUG "%s: reg=0x%02X, data=0x%02X\n", 87 + dprintk("%s: reg=0x%02X, data=0x%02X\n", 88 88 __func__, reg, b1[0]); 89 89 return 0; 90 90 }
+3 -5
drivers/media/dvb/frontends/atbm8830.c
··· 50 50 msg2.addr = dev_addr; 51 51 52 52 if (debug >= 2) 53 - printk(KERN_DEBUG "%s: reg=0x%04X, data=0x%02X\n", 54 - __func__, reg, data); 53 + dprintk("%s: reg=0x%04X, data=0x%02X\n", __func__, reg, data); 55 54 56 55 ret = i2c_transfer(priv->i2c, &msg1, 1); 57 56 if (ret != 1) ··· 76 77 77 78 ret = i2c_transfer(priv->i2c, &msg1, 1); 78 79 if (ret != 1) { 79 - dprintk(KERN_DEBUG "%s: error reg=0x%04x, ret=%i\n", 80 - __func__, reg, ret); 80 + dprintk("%s: error reg=0x%04x, ret=%i\n", __func__, reg, ret); 81 81 return -EIO; 82 82 } 83 83 ··· 86 88 87 89 *p_data = buf2[0]; 88 90 if (debug >= 2) 89 - printk(KERN_DEBUG "%s: reg=0x%04X, data=0x%02X\n", 91 + dprintk("%s: reg=0x%04X, data=0x%02X\n", 90 92 __func__, reg, buf2[0]); 91 93 92 94 return 0;
+4 -7
drivers/media/dvb/frontends/lgs8gxx.c
··· 60 60 msg.addr += 0x02; 61 61 62 62 if (debug >= 2) 63 - printk(KERN_DEBUG "%s: reg=0x%02X, data=0x%02X\n", 64 - __func__, reg, data); 63 + dprintk("%s: reg=0x%02X, data=0x%02X\n", __func__, reg, data); 65 64 66 65 ret = i2c_transfer(priv->i2c, &msg, 1); 67 66 68 67 if (ret != 1) 69 - dprintk(KERN_DEBUG "%s: error reg=0x%x, data=0x%x, ret=%i\n", 68 + dprintk("%s: error reg=0x%x, data=0x%x, ret=%i\n", 70 69 __func__, reg, data, ret); 71 70 72 71 return (ret != 1) ? -1 : 0; ··· 90 91 91 92 ret = i2c_transfer(priv->i2c, msg, 2); 92 93 if (ret != 2) { 93 - dprintk(KERN_DEBUG "%s: error reg=0x%x, ret=%i\n", 94 - __func__, reg, ret); 94 + dprintk("%s: error reg=0x%x, ret=%i\n", __func__, reg, ret); 95 95 return -1; 96 96 } 97 97 98 98 *p_data = b1[0]; 99 99 if (debug >= 2) 100 - printk(KERN_DEBUG "%s: reg=0x%02X, data=0x%02X\n", 101 - __func__, reg, b1[0]); 100 + dprintk("%s: reg=0x%02X, data=0x%02X\n", __func__, reg, b1[0]); 102 101 return 0; 103 102 } 104 103
+1 -1
drivers/media/video/saa7134/saa7134-input.c
··· 972 972 an existing device. Weird... 973 973 REVISIT: might no longer be needed */ 974 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 976 msg_msi.addr, dev->i2c_adap.name, 977 977 (1 == rc) ? "yes" : "no"); 978 978 break;
+6 -6
drivers/media/video/saa7134/saa7134-tvaudio.c
··· 550 550 } else if (0 != dev->last_carrier) { 551 551 /* no carrier -- try last detected one as fallback */ 552 552 carrier = dev->last_carrier; 553 - dprintk(KERN_WARNING "%s/audio: audio carrier scan failed, " 554 - "using %d.%03d MHz [last detected]\n", 555 - dev->name, carrier/1000, carrier%1000); 553 + dprintk("audio carrier scan failed, " 554 + "using %d.%03d MHz [last detected]\n", 555 + carrier/1000, carrier%1000); 556 556 557 557 } else { 558 558 /* no carrier + no fallback -- use default */ 559 559 carrier = default_carrier; 560 - dprintk(KERN_WARNING "%s/audio: audio carrier scan failed, " 561 - "using %d.%03d MHz [default]\n", 562 - dev->name, carrier/1000, carrier%1000); 560 + dprintk("audio carrier scan failed, " 561 + "using %d.%03d MHz [default]\n", 562 + carrier/1000, carrier%1000); 563 563 } 564 564 tvaudio_setcarrier(dev,carrier,carrier); 565 565 dev->automute = 0;