Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / media / common / tuners / max2165.c

diff --git a/drivers/media/common/tuners/max2165.c b/drivers/media/common/tuners/max2165.c
index 937e4b00d7eea162e9a966f01d8456f41db14587..9883617b78620a4e813bcfe3b7451a5430b60e44 100644 (file)
--- a/drivers/media/common/tuners/max2165.c
+++ b/drivers/media/common/tuners/max2165.c
@@ -52,13 +52,12 @@ static int max2165_write_reg(struct max2165_priv *priv, u8 reg, u8 data)
        msg.addr = priv->config->i2c_address;
 
        if (debug >= 2)
-               printk(KERN_DEBUG "%s: reg=0x%02X, data=0x%02X\n",
-                       __func__, reg, data);
+               dprintk("%s: reg=0x%02X, data=0x%02X\n", __func__, reg, data);
 
        ret = i2c_transfer(priv->i2c, &msg, 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);
 
        return (ret != 1) ? -EIO : 0;
@@ -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);
        if (ret != 2) {
-               dprintk(KERN_DEBUG "%s: error reg=0x%x, ret=%i\n",
-                       __func__, reg, ret);
+               dprintk("%s: error reg=0x%x, ret=%i\n", __func__, reg, ret);
                return -EIO;
        }
 
        *p_data = b1[0];
        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]);
        return 0;
 }