m68k: replace remaining __FUNCTION__ occurrences

__FUNCTION__ is gcc-specific, use __func__

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/arch/m68k/kernel/ints.c b/arch/m68k/kernel/ints.c
index 2b412454cb419fb91d898df93fcd0ffe507b6c32..ded7dd2f67b2803688965a49f0abb72faf1e0463 100644 (file)
--- a/arch/m68k/kernel/ints.c
+++ b/arch/m68k/kernel/ints.c
@@ -186,7 +186,7 @@ int setup_irq(unsigned int irq, struct irq_node *node)
 
        if (irq >= NR_IRQS || !(contr = irq_controller[irq])) {
                printk("%s: Incorrect IRQ %d from %s\n",
-                      __FUNCTION__, irq, node->devname);
+                      __func__, irq, node->devname);
                return -ENXIO;
        }
 
@@ -249,7 +249,7 @@ void free_irq(unsigned int irq, void *dev_id)
        unsigned long flags;
 
        if (irq >= NR_IRQS || !(contr = irq_controller[irq])) {
-               printk("%s: Incorrect IRQ %d\n", __FUNCTION__, irq);
+               printk("%s: Incorrect IRQ %d\n", __func__, irq);
                return;
        }
 
@@ -267,7 +267,7 @@ void free_irq(unsigned int irq, void *dev_id)
                node->handler = NULL;
        } else
                printk("%s: Removing probably wrong IRQ %d\n",
-                      __FUNCTION__, irq);
+                      __func__, irq);
 
        if (!irq_list[irq]) {
                if (contr->shutdown)
@@ -288,7 +288,7 @@ void enable_irq(unsigned int irq)
 
        if (irq >= NR_IRQS || !(contr = irq_controller[irq])) {
                printk("%s: Incorrect IRQ %d\n",
-                      __FUNCTION__, irq);
+                      __func__, irq);
                return;
        }
 
@@ -312,7 +312,7 @@ void disable_irq(unsigned int irq)
 
        if (irq >= NR_IRQS || !(contr = irq_controller[irq])) {
                printk("%s: Incorrect IRQ %d\n",
-                      __FUNCTION__, irq);
+                      __func__, irq);
                return;
        }
 

diff --git a/arch/m68k/mac/oss.c b/arch/m68k/mac/oss.c
index 50603d3dce843798b488f249b95bc53d984cdb76..3c943d2ec570b07f8e05c90701172b28bc964a85 100644 (file)
--- a/arch/m68k/mac/oss.c
+++ b/arch/m68k/mac/oss.c
@@ -190,7 +190,7 @@ void oss_irq_enable(int irq) {
                        break;
 #ifdef DEBUG_IRQUSE
                default:
-                       printk("%s unknown irq %d\n",__FUNCTION__, irq);
+                       printk("%s unknown irq %d\n", __func__, irq);
                        break;
 #endif
        }
@@ -230,7 +230,7 @@ void oss_irq_disable(int irq) {
                        break;
 #ifdef DEBUG_IRQUSE
                default:
-                       printk("%s unknown irq %d\n", __FUNCTION__, irq);
+                       printk("%s unknown irq %d\n", __func__, irq);
                        break;
 #endif
        }

diff --git a/arch/m68k/q40/q40ints.c b/arch/m68k/q40/q40ints.c
index 46161cef08b95520733b048b6cd40e53b7ad2716..9f0e3d59bf923e240bbe648a1d2e304659f38a23 100644 (file)
--- a/arch/m68k/q40/q40ints.c
+++ b/arch/m68k/q40/q40ints.c
@@ -47,7 +47,7 @@ static int q40_irq_startup(unsigned int irq)
        switch (irq) {
        case 1: case 2: case 8: case 9:
        case 11: case 12: case 13:
-               printk("%s: ISA IRQ %d not implemented by HW\n", __FUNCTION__, irq);
+               printk("%s: ISA IRQ %d not implemented by HW\n", __func__, irq);
                return -ENXIO;
        }
        return 0;