6 files changed, 11 insertions, 11 deletions

diff --git a/arch/arm/mach-pxa/cm-x270-pci.c b/arch/arm/mach-pxa/cm-x270-pci.c
index 15c4e0df3e10..fcda7d5cb693 100644
--- a/arch/arm/mach-pxa/cm-x270-pci.c
+++ b/arch/arm/mach-pxa/cm-x270-pci.c
@@ -104,7 +104,7 @@ static int __init cmx270_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
 {
         int irq;
 
-        dev_dbg(&dev->dev, "%s: slot=%x, pin=%x\n", __FUNCTION__, slot, pin);
+        dev_dbg(&dev->dev, "%s: slot=%x, pin=%x\n", __func__, slot, pin);
 
         irq = it8152_pci_map_irq(dev, slot, pin);
         if (irq)
diff --git a/arch/arm/mach-pxa/cm-x270.c b/arch/arm/mach-pxa/cm-x270.c
index 6012177a29a3..ecdbc96a4de1 100644
--- a/arch/arm/mach-pxa/cm-x270.c
+++ b/arch/arm/mach-pxa/cm-x270.c
@@ -504,11 +504,11 @@ static void cmx270_mci_setpower(struct device *dev, unsigned int vdd)
         struct pxamci_platform_data *p_d = dev->platform_data;
 
         if ((1 << vdd) & p_d->ocr_mask) {
-                printk(KERN_DEBUG "%s: on\n", __FUNCTION__);
+                printk(KERN_DEBUG "%s: on\n", __func__);
                 GPCR(105) = GPIO_bit(105);
         } else {
                 GPSR(105) = GPIO_bit(105);
-                printk(KERN_DEBUG "%s: off\n", __FUNCTION__);
+                printk(KERN_DEBUG "%s: off\n", __func__);
         }
 }
 
diff --git a/arch/arm/mach-pxa/dma.c b/arch/arm/mach-pxa/dma.c
index 93c4f31f127f..3215316d7b06 100644
--- a/arch/arm/mach-pxa/dma.c
+++ b/arch/arm/mach-pxa/dma.c
@@ -81,7 +81,7 @@ void pxa_free_dma (int dma_ch)
         if (!dma_channels[dma_ch].name) {
                 printk (KERN_CRIT
                         "%s: trying to free channel %d which is already freed\n",
-                        __FUNCTION__, dma_ch);
+                        __func__, dma_ch);
                 return;
         }
 
diff --git a/arch/arm/mach-pxa/em-x270.c b/arch/arm/mach-pxa/em-x270.c
index 3d0ad5065ee5..3bb31314429a 100644
--- a/arch/arm/mach-pxa/em-x270.c
+++ b/arch/arm/mach-pxa/em-x270.c
@@ -264,7 +264,7 @@ static int em_x270_mci_init(struct device *dev,
                           "MMC card detect", data);
         if (err) {
                 printk(KERN_ERR "%s: can't request MMC card detect IRQ: %d\n",
-                       __FUNCTION__, err);
+                       __func__, err);
                 return err;
         }
 
diff --git a/arch/arm/mach-pxa/mainstone.c b/arch/arm/mach-pxa/mainstone.c
index 345c3deeb02e..72a436fb9a29 100644
--- a/arch/arm/mach-pxa/mainstone.c
+++ b/arch/arm/mach-pxa/mainstone.c
@@ -390,11 +390,11 @@ static void mainstone_mci_setpower(struct device *dev, unsigned int vdd)
         struct pxamci_platform_data* p_d = dev->platform_data;
 
         if (( 1 << vdd) & p_d->ocr_mask) {
-                printk(KERN_DEBUG "%s: on\n", __FUNCTION__);
+                printk(KERN_DEBUG "%s: on\n", __func__);
                 MST_MSCWR1 |= MST_MSCWR1_MMC_ON;
                 MST_MSCWR1 &= ~MST_MSCWR1_MS_SEL;
         } else {
-                printk(KERN_DEBUG "%s: off\n", __FUNCTION__);
+                printk(KERN_DEBUG "%s: off\n", __func__);
                 MST_MSCWR1 &= ~MST_MSCWR1_MMC_ON;
         }
 }
diff --git a/arch/arm/mach-pxa/trizeps4.c b/arch/arm/mach-pxa/trizeps4.c
index 853fc9433750..f207fcd30cd7 100644
--- a/arch/arm/mach-pxa/trizeps4.c
+++ b/arch/arm/mach-pxa/trizeps4.c
@@ -217,7 +217,7 @@ void board_pcmcia_power(int power)
                 ConXS_BCR = trizeps_conxs_bcr;
 
         }
-        pr_debug("%s: o%s 0x%x\n", __FUNCTION__, power ? "n": "ff", trizeps_conxs_bcr);
+        pr_debug("%s: o%s 0x%x\n", __func__, power ? "n": "ff", trizeps_conxs_bcr);
 }
 
 /* backlight power switching for LCD panel */
@@ -228,7 +228,7 @@ static void board_backlight_power(int on)
         } else {
                 trizeps_conxs_bcr &= ~ConXS_BCR_L_DISP;
         }
-        pr_debug("%s: o%s 0x%x\n", __FUNCTION__, on ? "n" : "ff", trizeps_conxs_bcr);
+        pr_debug("%s: o%s 0x%x\n", __func__, on ? "n" : "ff", trizeps_conxs_bcr);
         ConXS_BCR = trizeps_conxs_bcr;
 }
 
@@ -238,10 +238,10 @@ static void board_mci_power(struct device *dev, unsigned int vdd)
         struct pxamci_platform_data* p_d = dev->platform_data;
 
         if (( 1 << vdd) & p_d->ocr_mask) {
-                pr_debug("%s: on\n", __FUNCTION__);
+                pr_debug("%s: on\n", __func__);
                 /* FIXME fill in values here */
         } else {
-                pr_debug("%s: off\n", __FUNCTION__);
+                pr_debug("%s: off\n", __func__);
                 /* FIXME fill in values here */
         }
 }