Merge branch 'master' into tk71

[mv-sheeva.git] / drivers / media / dvb / frontends / atbm8830.c

diff --git a/drivers/media/dvb/frontends/atbm8830.c b/drivers/media/dvb/frontends/atbm8830.c
index 43aac2f85c2e5ccd895288d20bbdcfb7c668930a..1539ea1f81acc9abee58b96bc04c182866febb91 100644 (file)
--- 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)
        msg2.addr = dev_addr;
 
        if (debug >= 2)
-               printk(KERN_DEBUG "%s: reg=0x%04X, data=0x%02X\n",
-                       __func__, reg, data);
+               dprintk("%s: reg=0x%04X, data=0x%02X\n", __func__, reg, data);
 
        ret = i2c_transfer(priv->i2c, &msg1, 1);
        if (ret != 1)
@@ -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);
        if (ret != 1) {
-               dprintk(KERN_DEBUG "%s: error reg=0x%04x, ret=%i\n",
-                       __func__, reg, ret);
+               dprintk("%s: error reg=0x%04x, ret=%i\n", __func__, reg, ret);
                return -EIO;
        }
 
@@ -88,7 +86,7 @@ static int atbm8830_read_reg(struct atbm_state *priv, u16 reg, u8 *p_data)
 
        *p_data = buf2[0];
        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]);
 
        return 0;