Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[linux-2.6-omap-h63xx.git] / drivers / media / dvb / frontends / ves1820.c

diff --git a/drivers/media/dvb/frontends/ves1820.c b/drivers/media/dvb/frontends/ves1820.c
index 60433b5011fde27e1ddaadc6279a40165352e379..a184597f1d9be0002b8f567b245a849abef6553c 100644 (file)
--- a/drivers/media/dvb/frontends/ves1820.c
+++ b/drivers/media/dvb/frontends/ves1820.c
@@ -65,8 +65,8 @@ static int ves1820_writereg(struct ves1820_state *state, u8 reg, u8 data)
        ret = i2c_transfer(state->i2c, &msg, 1);
 
        if (ret != 1)
-               printk("ves1820: %s(): writereg error (reg == 0x%02x,"
-                       "val == 0x%02x, ret == %i)\n", __FUNCTION__, reg, data, ret);
+               printk("ves1820: %s(): writereg error (reg == 0x%02x, "
+                       "val == 0x%02x, ret == %i)\n", __func__, reg, data, ret);
 
        return (ret != 1) ? -EREMOTEIO : 0;
 }
@@ -84,8 +84,8 @@ static u8 ves1820_readreg(struct ves1820_state *state, u8 reg)
        ret = i2c_transfer(state->i2c, msg, 2);
 
        if (ret != 2)
-               printk("ves1820: %s(): readreg error (reg == 0x%02x,"
-               "ret == %i)\n", __FUNCTION__, reg, ret);
+               printk("ves1820: %s(): readreg error (reg == 0x%02x, "
+               "ret == %i)\n", __func__, reg, ret);
 
        return b1[0];
 }