9 files changed, 18 insertions, 18 deletions

diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
index 24c62b848bf9..7f138c6195ff 100644
--- a/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c
@@ -382,7 +382,7 @@ fail:
         spin_unlock_irqrestore(&gpio_lock, flags);
         if (status)
                 pr_debug("%s: gpio-%d status %d\n",
-                        __FUNCTION__, gpio, status);
+                        __func__, gpio, status);
         return status;
 }
 EXPORT_SYMBOL_GPL(gpio_direction_input);
@@ -420,7 +420,7 @@ fail:
         spin_unlock_irqrestore(&gpio_lock, flags);
         if (status)
                 pr_debug("%s: gpio-%d status %d\n",
-                        __FUNCTION__, gpio, status);
+                        __func__, gpio, status);
         return status;
 }
 EXPORT_SYMBOL_GPL(gpio_direction_output);
diff --git a/drivers/hwmon/ads7828.c b/drivers/hwmon/ads7828.c
index ed71a8bc70dc..5c8b6e0ff47c 100644
--- a/drivers/hwmon/ads7828.c
+++ b/drivers/hwmon/ads7828.c
@@ -224,7 +224,7 @@ static int ads7828_detect(struct i2c_adapter *adapter, int address, int kind)
                         if (in_data & 0xF000) {
                                 printk(KERN_DEBUG
                                 "%s : Doesn't look like an ads7828 device\n",
-                                __FUNCTION__);
+                                __func__);
                                 goto exit_free;
                         }
                 }
diff --git a/drivers/mfd/asic3.c b/drivers/mfd/asic3.c
index f6f2d960cadb..ef8a492766a7 100644
--- a/drivers/mfd/asic3.c
+++ b/drivers/mfd/asic3.c
@@ -132,7 +132,7 @@ static void asic3_irq_demux(unsigned int irq, struct irq_desc *desc)
 
         if (iter >= MAX_ASIC_ISR_LOOPS)
                 printk(KERN_ERR "%s: interrupt processing overrun\n",
-                       __FUNCTION__);
+                       __func__);
 }
 
 static inline int asic3_irq_to_bank(struct asic3 *asic, int irq)
@@ -409,7 +409,7 @@ int asic3_gpio_get_value(struct asic3 *asic, unsigned gpio)
                 return asic3_get_gpio_d(asic, Status) & mask;
         default:
                 printk(KERN_ERR "%s: invalid GPIO value 0x%x",
-                       __FUNCTION__, gpio);
+                       __func__, gpio);
                 return -EINVAL;
         }
 }
@@ -437,7 +437,7 @@ void asic3_gpio_set_value(struct asic3 *asic, unsigned gpio, int val)
                 return;
         default:
                 printk(KERN_ERR "%s: invalid GPIO value 0x%x",
-                       __FUNCTION__, gpio);
+                       __func__, gpio);
                 return;
         }
 }
diff --git a/drivers/mfd/sm501.c b/drivers/mfd/sm501.c
index 6e655b4c6682..2fe64734d8af 100644
--- a/drivers/mfd/sm501.c
+++ b/drivers/mfd/sm501.c
@@ -349,11 +349,11 @@ int sm501_unit_power(struct device *dev, unsigned int unit, unsigned int to)
         mode &= 3;              /* get current power mode */
 
         if (unit >= ARRAY_SIZE(sm->unit_power)) {
-                dev_err(dev, "%s: bad unit %d\n", __FUNCTION__, unit);
+                dev_err(dev, "%s: bad unit %d\n", __func__, unit);
                 goto already;
         }
 
-        dev_dbg(sm->dev, "%s: unit %d, cur %d, to %d\n", __FUNCTION__, unit,
+        dev_dbg(sm->dev, "%s: unit %d, cur %d, to %d\n", __func__, unit,
                 sm->unit_power[unit], to);
 
         if (to == 0 && sm->unit_power[unit] == 0) {
diff --git a/drivers/parport/parport_gsc.c b/drivers/parport/parport_gsc.c
index 0e77ae2b71a0..e6a7e847ee80 100644
--- a/drivers/parport/parport_gsc.c
+++ b/drivers/parport/parport_gsc.c
@@ -365,11 +365,11 @@ static int __devinit parport_init_chip(struct parisc_device *dev)
         if (boot_cpu_data.cpu_type > pcxt && !pdc_add_valid(port+4)) {
 
                 /* Initialize bidirectional-mode (0x10) & data-tranfer-mode #1 (0x20) */
-                printk("%s: initialize bidirectional-mode.\n", __FUNCTION__);
+                printk("%s: initialize bidirectional-mode.\n", __func__);
                 parport_writeb ( (0x10 + 0x20), port + 4);
 
         } else {
-                printk("%s: enhanced parport-modes not supported.\n", __FUNCTION__);
+                printk("%s: enhanced parport-modes not supported.\n", __func__);
         }
         
         p = parport_gsc_probe_port(port, 0, dev->irq,
diff --git a/drivers/parport/parport_pc.c b/drivers/parport/parport_pc.c
index e71092e80288..e0c2a4584ec6 100644
--- a/drivers/parport/parport_pc.c
+++ b/drivers/parport/parport_pc.c
@@ -1415,7 +1415,7 @@ static void __devinit winbond_check(int io, int key)
 {
         int devid,devrev,oldid,x_devid,x_devrev,x_oldid;
 
-        if (!request_region(io, 3, __FUNCTION__))
+        if (!request_region(io, 3, __func__))
                 return;
 
         /* First probe without key */
@@ -1449,7 +1449,7 @@ static void __devinit winbond_check2(int io,int key)
 {
         int devid,devrev,oldid,x_devid,x_devrev,x_oldid;
 
-        if (!request_region(io, 3, __FUNCTION__))
+        if (!request_region(io, 3, __func__))
                 return;
 
         /* First probe without the key */
@@ -1482,7 +1482,7 @@ static void __devinit smsc_check(int io, int key)
 {
         int id,rev,oldid,oldrev,x_id,x_rev,x_oldid,x_oldrev;
 
-        if (!request_region(io, 3, __FUNCTION__))
+        if (!request_region(io, 3, __func__))
                 return;
 
         /* First probe without the key */
@@ -1547,7 +1547,7 @@ static void __devinit detect_and_report_it87(void)
         u8 r;
         if (verbose_probing)
                 printk(KERN_DEBUG "IT8705 Super-IO detection, now testing port 2E ...\n");
-        if (!request_region(0x2e, 1, __FUNCTION__))
+        if (!request_region(0x2e, 1, __func__))
                 return;
         outb(0x87, 0x2e);
         outb(0x01, 0x2e);
diff --git a/drivers/sbus/char/cpwatchdog.c b/drivers/sbus/char/cpwatchdog.c
index a4e758143665..235703414370 100644
--- a/drivers/sbus/char/cpwatchdog.c
+++ b/drivers/sbus/char/cpwatchdog.c
@@ -637,7 +637,7 @@ static int wd_inittimer(int whichdog)
                         break;
                 default:
                         printk("%s: %s: invalid watchdog id: %i\n",
-                                WD_OBPNAME, __FUNCTION__, whichdog);
+                                WD_OBPNAME, __func__, whichdog);
                         return(1);
         }
         if(0 != misc_register(whichmisc))
diff --git a/drivers/sbus/char/uctrl.c b/drivers/sbus/char/uctrl.c
index 44d2ef906ac7..383f32c1d347 100644
--- a/drivers/sbus/char/uctrl.c
+++ b/drivers/sbus/char/uctrl.c
@@ -393,13 +393,13 @@ static int __init ts102_uctrl_init(void)
         err = request_irq(driver->irq, uctrl_interrupt, 0, "uctrl", driver);
         if (err) {
                 printk("%s: unable to register irq %d\n",
-                       __FUNCTION__, driver->irq);
+                       __func__, driver->irq);
                 return err;
         }
 
         if (misc_register(&uctrl_dev)) {
                 printk("%s: unable to get misc minor %d\n",
-                       __FUNCTION__, uctrl_dev.minor);
+                       __func__, uctrl_dev.minor);
                 free_irq(driver->irq, driver);
                 return -ENODEV;
         }
diff --git a/drivers/w1/w1_log.h b/drivers/w1/w1_log.h
index fe6bdf43380f..e6ab7cf08f88 100644
--- a/drivers/w1/w1_log.h
+++ b/drivers/w1/w1_log.h
@@ -30,7 +30,7 @@
 #  define assert(expr) \
         if(unlikely(!(expr))) {                                 \
         printk(KERN_ERR "Assertion failed! %s,%s,%s,line=%d\n", \
-        #expr,__FILE__,__FUNCTION__,__LINE__);                  \
+        #expr, __FILE__, __func__, __LINE__);                   \
         }
 #endif