Commit c429e7b6 authored by Joe Perches's avatar Joe Perches Committed by Mauro Carvalho Chehab

[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: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 1bc25f7d
...@@ -52,13 +52,12 @@ static int max2165_write_reg(struct max2165_priv *priv, u8 reg, u8 data) ...@@ -52,13 +52,12 @@ static int max2165_write_reg(struct max2165_priv *priv, u8 reg, u8 data)
msg.addr = priv->config->i2c_address; msg.addr = priv->config->i2c_address;
if (debug >= 2) if (debug >= 2)
printk(KERN_DEBUG "%s: reg=0x%02X, data=0x%02X\n", dprintk("%s: reg=0x%02X, data=0x%02X\n", __func__, reg, data);
__func__, reg, data);
ret = i2c_transfer(priv->i2c, &msg, 1); ret = i2c_transfer(priv->i2c, &msg, 1);
if (ret != 1) if (ret != 1)
dprintk(KERN_DEBUG "%s: error reg=0x%x, data=0x%x, ret=%i\n", dprintk("%s: error reg=0x%x, data=0x%x, ret=%i\n",
__func__, reg, data, ret); __func__, reg, data, ret);
return (ret != 1) ? -EIO : 0; return (ret != 1) ? -EIO : 0;
...@@ -78,14 +77,13 @@ static int max2165_read_reg(struct max2165_priv *priv, u8 reg, u8 *p_data) ...@@ -78,14 +77,13 @@ static int max2165_read_reg(struct max2165_priv *priv, u8 reg, u8 *p_data)
ret = i2c_transfer(priv->i2c, msg, 2); ret = i2c_transfer(priv->i2c, msg, 2);
if (ret != 2) { if (ret != 2) {
dprintk(KERN_DEBUG "%s: error reg=0x%x, ret=%i\n", dprintk("%s: error reg=0x%x, ret=%i\n", __func__, reg, ret);
__func__, reg, ret);
return -EIO; return -EIO;
} }
*p_data = b1[0]; *p_data = b1[0];
if (debug >= 2) if (debug >= 2)
printk(KERN_DEBUG "%s: reg=0x%02X, data=0x%02X\n", dprintk("%s: reg=0x%02X, data=0x%02X\n",
__func__, reg, b1[0]); __func__, reg, b1[0]);
return 0; return 0;
} }
......
...@@ -50,8 +50,7 @@ static int atbm8830_write_reg(struct atbm_state *priv, u16 reg, u8 data) ...@@ -50,8 +50,7 @@ static int atbm8830_write_reg(struct atbm_state *priv, u16 reg, u8 data)
msg2.addr = dev_addr; msg2.addr = dev_addr;
if (debug >= 2) if (debug >= 2)
printk(KERN_DEBUG "%s: reg=0x%04X, data=0x%02X\n", dprintk("%s: reg=0x%04X, data=0x%02X\n", __func__, reg, data);
__func__, reg, data);
ret = i2c_transfer(priv->i2c, &msg1, 1); ret = i2c_transfer(priv->i2c, &msg1, 1);
if (ret != 1) if (ret != 1)
...@@ -77,8 +76,7 @@ static int atbm8830_read_reg(struct atbm_state *priv, u16 reg, u8 *p_data) ...@@ -77,8 +76,7 @@ static int atbm8830_read_reg(struct atbm_state *priv, u16 reg, u8 *p_data)
ret = i2c_transfer(priv->i2c, &msg1, 1); ret = i2c_transfer(priv->i2c, &msg1, 1);
if (ret != 1) { if (ret != 1) {
dprintk(KERN_DEBUG "%s: error reg=0x%04x, ret=%i\n", dprintk("%s: error reg=0x%04x, ret=%i\n", __func__, reg, ret);
__func__, reg, ret);
return -EIO; return -EIO;
} }
...@@ -88,7 +86,7 @@ static int atbm8830_read_reg(struct atbm_state *priv, u16 reg, u8 *p_data) ...@@ -88,7 +86,7 @@ static int atbm8830_read_reg(struct atbm_state *priv, u16 reg, u8 *p_data)
*p_data = buf2[0]; *p_data = buf2[0];
if (debug >= 2) if (debug >= 2)
printk(KERN_DEBUG "%s: reg=0x%04X, data=0x%02X\n", dprintk("%s: reg=0x%04X, data=0x%02X\n",
__func__, reg, buf2[0]); __func__, reg, buf2[0]);
return 0; return 0;
......
...@@ -60,13 +60,12 @@ static int lgs8gxx_write_reg(struct lgs8gxx_state *priv, u8 reg, u8 data) ...@@ -60,13 +60,12 @@ static int lgs8gxx_write_reg(struct lgs8gxx_state *priv, u8 reg, u8 data)
msg.addr += 0x02; msg.addr += 0x02;
if (debug >= 2) if (debug >= 2)
printk(KERN_DEBUG "%s: reg=0x%02X, data=0x%02X\n", dprintk("%s: reg=0x%02X, data=0x%02X\n", __func__, reg, data);
__func__, reg, data);
ret = i2c_transfer(priv->i2c, &msg, 1); ret = i2c_transfer(priv->i2c, &msg, 1);
if (ret != 1) if (ret != 1)
dprintk(KERN_DEBUG "%s: error reg=0x%x, data=0x%x, ret=%i\n", dprintk("%s: error reg=0x%x, data=0x%x, ret=%i\n",
__func__, reg, data, ret); __func__, reg, data, ret);
return (ret != 1) ? -1 : 0; return (ret != 1) ? -1 : 0;
...@@ -91,15 +90,13 @@ static int lgs8gxx_read_reg(struct lgs8gxx_state *priv, u8 reg, u8 *p_data) ...@@ -91,15 +90,13 @@ static int lgs8gxx_read_reg(struct lgs8gxx_state *priv, u8 reg, u8 *p_data)
ret = i2c_transfer(priv->i2c, msg, 2); ret = i2c_transfer(priv->i2c, msg, 2);
if (ret != 2) { if (ret != 2) {
dprintk(KERN_DEBUG "%s: error reg=0x%x, ret=%i\n", dprintk("%s: error reg=0x%x, ret=%i\n", __func__, reg, ret);
__func__, reg, ret);
return -1; return -1;
} }
*p_data = b1[0]; *p_data = b1[0];
if (debug >= 2) if (debug >= 2)
printk(KERN_DEBUG "%s: reg=0x%02X, data=0x%02X\n", dprintk("%s: reg=0x%02X, data=0x%02X\n", __func__, reg, b1[0]);
__func__, reg, b1[0]);
return 0; return 0;
} }
......
...@@ -972,7 +972,7 @@ void saa7134_probe_i2c_ir(struct saa7134_dev *dev) ...@@ -972,7 +972,7 @@ void saa7134_probe_i2c_ir(struct saa7134_dev *dev)
an existing device. Weird... an existing device. Weird...
REVISIT: might no longer be needed */ REVISIT: might no longer be needed */
rc = i2c_transfer(&dev->i2c_adap, &msg_msi, 1); rc = i2c_transfer(&dev->i2c_adap, &msg_msi, 1);
dprintk(KERN_DEBUG "probe 0x%02x @ %s: %s\n", dprintk("probe 0x%02x @ %s: %s\n",
msg_msi.addr, dev->i2c_adap.name, msg_msi.addr, dev->i2c_adap.name,
(1 == rc) ? "yes" : "no"); (1 == rc) ? "yes" : "no");
break; break;
......
...@@ -550,16 +550,16 @@ static int tvaudio_thread(void *data) ...@@ -550,16 +550,16 @@ static int tvaudio_thread(void *data)
} else if (0 != dev->last_carrier) { } else if (0 != dev->last_carrier) {
/* no carrier -- try last detected one as fallback */ /* no carrier -- try last detected one as fallback */
carrier = dev->last_carrier; carrier = dev->last_carrier;
dprintk(KERN_WARNING "%s/audio: audio carrier scan failed, " dprintk("audio carrier scan failed, "
"using %d.%03d MHz [last detected]\n", "using %d.%03d MHz [last detected]\n",
dev->name, carrier/1000, carrier%1000); carrier/1000, carrier%1000);
} else { } else {
/* no carrier + no fallback -- use default */ /* no carrier + no fallback -- use default */
carrier = default_carrier; carrier = default_carrier;
dprintk(KERN_WARNING "%s/audio: audio carrier scan failed, " dprintk("audio carrier scan failed, "
"using %d.%03d MHz [default]\n", "using %d.%03d MHz [default]\n",
dev->name, carrier/1000, carrier%1000); carrier/1000, carrier%1000);
} }
tvaudio_setcarrier(dev,carrier,carrier); tvaudio_setcarrier(dev,carrier,carrier);
dev->automute = 0; dev->automute = 0;
......
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