1 files changed, 8 insertions, 8 deletions

diff --git a/drivers/media/video/cx23885/cx23885-i2c.c b/drivers/media/video/cx23885/cx23885-i2c.c
index 748c79a46549..8773a1fd97cb 100644
--- a/drivers/media/video/cx23885/cx23885-i2c.c
+++ b/drivers/media/video/cx23885/cx23885-i2c.c
@@ -87,10 +87,10 @@ static int i2c_sendbytes(struct i2c_adapter *i2c_adap,
         int retval, cnt;
 
         if (joined_rlen)
-                dprintk(1, "%s(msg->wlen=%d, nextmsg->rlen=%d)\n", __FUNCTION__,
+                dprintk(1, "%s(msg->wlen=%d, nextmsg->rlen=%d)\n", __func__,
                         msg->len, joined_rlen);
         else
-                dprintk(1, "%s(msg->len=%d)\n", __FUNCTION__, msg->len);
+                dprintk(1, "%s(msg->len=%d)\n", __func__, msg->len);
 
         /* Deal with i2c probe functions with zero payload */
         if (msg->len == 0) {
@@ -101,7 +101,7 @@ static int i2c_sendbytes(struct i2c_adapter *i2c_adap,
                 if (!i2c_slave_did_ack(i2c_adap))
                         return -EIO;
 
-                dprintk(1, "%s() returns 0\n", __FUNCTION__);
+                dprintk(1, "%s() returns 0\n", __func__);
                 return 0;
         }
 
@@ -176,7 +176,7 @@ static int i2c_readbytes(struct i2c_adapter *i2c_adap,
 
 
         if (i2c_debug && !joined)
-                dprintk(1, "%s(msg->len=%d)\n", __FUNCTION__, msg->len);
+                dprintk(1, "%s(msg->len=%d)\n", __func__, msg->len);
 
         /* Deal with i2c probe functions with zero payload */
         if (msg->len == 0) {
@@ -188,7 +188,7 @@ static int i2c_readbytes(struct i2c_adapter *i2c_adap,
                         return -EIO;
 
 
-                dprintk(1, "%s() returns 0\n", __FUNCTION__);
+                dprintk(1, "%s() returns 0\n", __func__);
                 return 0;
         }
 
@@ -238,11 +238,11 @@ static int i2c_xfer(struct i2c_adapter *i2c_adap,
         struct cx23885_dev *dev = bus->dev;
         int i, retval = 0;
 
-        dprintk(1, "%s(num = %d)\n", __FUNCTION__, num);
+        dprintk(1, "%s(num = %d)\n", __func__, num);
 
         for (i = 0 ; i < num; i++) {
                 dprintk(1, "%s(num = %d) addr = 0x%02x  len = 0x%x\n",
-                        __FUNCTION__, num, msgs[i].addr, msgs[i].len);
+                        __func__, num, msgs[i].addr, msgs[i].len);
                 if (msgs[i].flags & I2C_M_RD) {
                         /* read */
                         retval = i2c_readbytes(i2c_adap, &msgs[i], 0);
@@ -383,7 +383,7 @@ int cx23885_i2c_register(struct cx23885_i2c *bus)
 {
         struct cx23885_dev *dev = bus->dev;
 
-        dprintk(1, "%s(bus = %d)\n", __FUNCTION__, bus->nr);
+        dprintk(1, "%s(bus = %d)\n", __func__, bus->nr);
 
         memcpy(&bus->i2c_adap, &cx23885_i2c_adap_template,
                sizeof(bus->i2c_adap));