diff options
author | Joe Perches <joe@perches.com> | 2010-10-25 22:44:25 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-12-29 05:16:29 -0500 |
commit | c429e7b62a54bf34c1995b45faeaeb84104f1705 (patch) | |
tree | 80470e48b437e6c8ea7d92591ea6f88519e37370 /drivers/media/dvb | |
parent | 1bc25f7d6c0f353d3c73252048fe03a3d8f0e6b8 (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/dvb')
-rw-r--r-- | drivers/media/dvb/frontends/atbm8830.c | 8 | ||||
-rw-r--r-- | drivers/media/dvb/frontends/lgs8gxx.c | 11 |
2 files changed, 7 insertions, 12 deletions
diff --git a/drivers/media/dvb/frontends/atbm8830.c b/drivers/media/dvb/frontends/atbm8830.c index 43aac2f85c2..1539ea1f81a 100644 --- a/drivers/media/dvb/frontends/atbm8830.c +++ b/drivers/media/dvb/frontends/atbm8830.c | |||
@@ -50,8 +50,7 @@ static int atbm8830_write_reg(struct atbm_state *priv, u16 reg, u8 data) | |||
50 | msg2.addr = dev_addr; | 50 | msg2.addr = dev_addr; |
51 | 51 | ||
52 | if (debug >= 2) | 52 | if (debug >= 2) |
53 | printk(KERN_DEBUG "%s: reg=0x%04X, data=0x%02X\n", | 53 | dprintk("%s: reg=0x%04X, data=0x%02X\n", __func__, reg, data); |
54 | __func__, reg, data); | ||
55 | 54 | ||
56 | ret = i2c_transfer(priv->i2c, &msg1, 1); | 55 | ret = i2c_transfer(priv->i2c, &msg1, 1); |
57 | if (ret != 1) | 56 | if (ret != 1) |
@@ -77,8 +76,7 @@ static int atbm8830_read_reg(struct atbm_state *priv, u16 reg, u8 *p_data) | |||
77 | 76 | ||
78 | ret = i2c_transfer(priv->i2c, &msg1, 1); | 77 | ret = i2c_transfer(priv->i2c, &msg1, 1); |
79 | if (ret != 1) { | 78 | if (ret != 1) { |
80 | dprintk(KERN_DEBUG "%s: error reg=0x%04x, ret=%i\n", | 79 | dprintk("%s: error reg=0x%04x, ret=%i\n", __func__, reg, ret); |
81 | __func__, reg, ret); | ||
82 | return -EIO; | 80 | return -EIO; |
83 | } | 81 | } |
84 | 82 | ||
@@ -88,7 +86,7 @@ static int atbm8830_read_reg(struct atbm_state *priv, u16 reg, u8 *p_data) | |||
88 | 86 | ||
89 | *p_data = buf2[0]; | 87 | *p_data = buf2[0]; |
90 | if (debug >= 2) | 88 | if (debug >= 2) |
91 | printk(KERN_DEBUG "%s: reg=0x%04X, data=0x%02X\n", | 89 | dprintk("%s: reg=0x%04X, data=0x%02X\n", |
92 | __func__, reg, buf2[0]); | 90 | __func__, reg, buf2[0]); |
93 | 91 | ||
94 | return 0; | 92 | return 0; |
diff --git a/drivers/media/dvb/frontends/lgs8gxx.c b/drivers/media/dvb/frontends/lgs8gxx.c index 0fcddc4569d..1172b54689f 100644 --- a/drivers/media/dvb/frontends/lgs8gxx.c +++ b/drivers/media/dvb/frontends/lgs8gxx.c | |||
@@ -60,13 +60,12 @@ static int lgs8gxx_write_reg(struct lgs8gxx_state *priv, u8 reg, u8 data) | |||
60 | msg.addr += 0x02; | 60 | msg.addr += 0x02; |
61 | 61 | ||
62 | if (debug >= 2) | 62 | if (debug >= 2) |
63 | printk(KERN_DEBUG "%s: reg=0x%02X, data=0x%02X\n", | 63 | dprintk("%s: reg=0x%02X, data=0x%02X\n", __func__, reg, data); |
64 | __func__, reg, data); | ||
65 | 64 | ||
66 | ret = i2c_transfer(priv->i2c, &msg, 1); | 65 | ret = i2c_transfer(priv->i2c, &msg, 1); |
67 | 66 | ||
68 | if (ret != 1) | 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 | __func__, reg, data, ret); | 69 | __func__, reg, data, ret); |
71 | 70 | ||
72 | return (ret != 1) ? -1 : 0; | 71 | return (ret != 1) ? -1 : 0; |
@@ -91,15 +90,13 @@ static int lgs8gxx_read_reg(struct lgs8gxx_state *priv, u8 reg, u8 *p_data) | |||
91 | 90 | ||
92 | ret = i2c_transfer(priv->i2c, msg, 2); | 91 | ret = i2c_transfer(priv->i2c, msg, 2); |
93 | if (ret != 2) { | 92 | if (ret != 2) { |
94 | dprintk(KERN_DEBUG "%s: error reg=0x%x, ret=%i\n", | 93 | dprintk("%s: error reg=0x%x, ret=%i\n", __func__, reg, ret); |
95 | __func__, reg, ret); | ||
96 | return -1; | 94 | return -1; |
97 | } | 95 | } |
98 | 96 | ||
99 | *p_data = b1[0]; | 97 | *p_data = b1[0]; |
100 | if (debug >= 2) | 98 | if (debug >= 2) |
101 | printk(KERN_DEBUG "%s: reg=0x%02X, data=0x%02X\n", | 99 | dprintk("%s: reg=0x%02X, data=0x%02X\n", __func__, reg, b1[0]); |
102 | __func__, reg, b1[0]); | ||
103 | return 0; | 100 | return 0; |
104 | } | 101 | } |
105 | 102 | ||