2 files changed, 7 insertions, 7 deletions

diff --git a/drivers/media/common/saa7146_core.c b/drivers/media/common/saa7146_core.c
index 7707b8c7394b..89c7660b85d6 100644
--- a/drivers/media/common/saa7146_core.c
+++ b/drivers/media/common/saa7146_core.c
@@ -74,7 +74,7 @@ static inline int saa7146_wait_for_debi_done_sleep(struct saa7146_dev *dev,
                 if (err) {
                         printk(KERN_ERR "%s: %s timed out while waiting for "
                                         "registers getting programmed\n",
-                                        dev->name, __FUNCTION__);
+                                        dev->name, __func__);
                         return -ETIMEDOUT;
                 }
                 msleep(1);
@@ -89,7 +89,7 @@ static inline int saa7146_wait_for_debi_done_sleep(struct saa7146_dev *dev,
                 saa7146_read(dev, MC2);
                 if (err) {
                         DEB_S(("%s: %s timed out while waiting for transfer "
-                                "completion\n", dev->name, __FUNCTION__));
+                                "completion\n", dev->name, __func__));
                         return -ETIMEDOUT;
                 }
                 msleep(1);
@@ -111,7 +111,7 @@ static inline int saa7146_wait_for_debi_done_busyloop(struct saa7146_dev *dev,
                 if (!loops--) {
                         printk(KERN_ERR "%s: %s timed out while waiting for "
                                         "registers getting programmed\n",
-                                        dev->name, __FUNCTION__);
+                                        dev->name, __func__);
                         return -ETIMEDOUT;
                 }
                 udelay(1);
@@ -125,7 +125,7 @@ static inline int saa7146_wait_for_debi_done_busyloop(struct saa7146_dev *dev,
                 saa7146_read(dev, MC2);
                 if (!loops--) {
                         DEB_S(("%s: %s timed out while waiting for transfer "
-                                "completion\n", dev->name, __FUNCTION__));
+                                "completion\n", dev->name, __func__));
                         return -ETIMEDOUT;
                 }
                 udelay(5);
diff --git a/drivers/media/common/saa7146_i2c.c b/drivers/media/common/saa7146_i2c.c
index 7e7689afae62..35b01ec40a51 100644
--- a/drivers/media/common/saa7146_i2c.c
+++ b/drivers/media/common/saa7146_i2c.c
@@ -203,7 +203,7 @@ static int saa7146_i2c_writeout(struct saa7146_dev *dev, u32* dword, int short_d
                                 return -ERESTARTSYS;
 
                         printk(KERN_WARNING "%s %s [irq]: timed out waiting for end of xfer\n",
-                                dev->name, __FUNCTION__);
+                                dev->name, __func__);
                         return -EIO;
                 }
                 status = saa7146_read(dev, I2C_STATUS);
@@ -221,7 +221,7 @@ static int saa7146_i2c_writeout(struct saa7146_dev *dev, u32* dword, int short_d
                         }
                         if (time_after(jiffies,timeout)) {
                                 printk(KERN_WARNING "%s %s: timed out waiting for MC2\n",
-                                        dev->name, __FUNCTION__);
+                                        dev->name, __func__);
                                 return -EIO;
                         }
                 }
@@ -238,7 +238,7 @@ static int saa7146_i2c_writeout(struct saa7146_dev *dev, u32* dword, int short_d
                                  * (no answer from nonexisistant device...)
                                  */
                                 printk(KERN_WARNING "%s %s [poll]: timed out waiting for end of xfer\n",
-                                        dev->name, __FUNCTION__);
+                                        dev->name, __func__);
                                 return -EIO;
                         }
                         if (++trial < 50 && short_delay)