sh: replace remaining __FUNCTION__ occurrences

__FUNCTION__ is gcc-specific, use __func__

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>

6 files changed, 7 insertions, 7 deletions

diff --git a/arch/sh/kernel/cpu/sh4/sq.c b/arch/sh/kernel/cpu/sh4/sq.c
index 8250e017bd4e..9561b02ade0e 100644
--- a/arch/sh/kernel/cpu/sh4/sq.c
+++ b/arch/sh/kernel/cpu/sh4/sq.c
@@ -216,7 +216,7 @@ void sq_unmap(unsigned long vaddr)
 
         if (unlikely(!map)) {
                 printk("%s: bad store queue address 0x%08lx\n",
-                       __FUNCTION__, vaddr);
+                       __func__, vaddr);
                 return;
         }
 
@@ -233,7 +233,7 @@ void sq_unmap(unsigned long vaddr)
                 vma = remove_vm_area((void *)(map->sq_addr & PAGE_MASK));
                 if (!vma) {
                         printk(KERN_ERR "%s: bad address 0x%08lx\n",
-                               __FUNCTION__, map->sq_addr);
+                               __func__, map->sq_addr);
                         return;
                 }
         }
diff --git a/arch/sh/kernel/cpu/sh5/unwind.c b/arch/sh/kernel/cpu/sh5/unwind.c
index 119c20afd4e5..b205b25eaf45 100644
--- a/arch/sh/kernel/cpu/sh5/unwind.c
+++ b/arch/sh/kernel/cpu/sh5/unwind.c
@@ -149,7 +149,7 @@ static int lookup_prev_stack_frame(unsigned long fp, unsigned long pc,
                         if (dest >= 63) {
                                 printk(KERN_NOTICE "%s: Invalid dest reg %d "
                                        "specified in movi handler. Failed "
-                                       "opcode was 0x%lx: ", __FUNCTION__,
+                                       "opcode was 0x%lx: ", __func__,
                                        dest, op);
 
                                 continue;
diff --git a/arch/sh/kernel/timers/timer-cmt.c b/arch/sh/kernel/timers/timer-cmt.c
index 71312324b5de..d20c8c375881 100644
--- a/arch/sh/kernel/timers/timer-cmt.c
+++ b/arch/sh/kernel/timers/timer-cmt.c
@@ -77,7 +77,7 @@ static unsigned long cmt_timer_get_offset(void)
                                 count -= LATCH;
                         } else {
                                 printk("%s (): hardware timer problem?\n",
-                                       __FUNCTION__);
+                                       __func__);
                         }
                 }
         } else
diff --git a/arch/sh/kernel/timers/timer-mtu2.c b/arch/sh/kernel/timers/timer-mtu2.c
index ade9d6eb29f9..fe453c01f9c9 100644
--- a/arch/sh/kernel/timers/timer-mtu2.c
+++ b/arch/sh/kernel/timers/timer-mtu2.c
@@ -76,7 +76,7 @@ static unsigned long mtu2_timer_get_offset(void)
                                 count -= LATCH;
                         } else {
                                 printk("%s (): hardware timer problem?\n",
-                                       __FUNCTION__);
+                                       __func__);
                         }
                 }
         } else
diff --git a/arch/sh/kernel/topology.c b/arch/sh/kernel/topology.c
index 9b5844a1bdaa..0838942b7083 100644
--- a/arch/sh/kernel/topology.c
+++ b/arch/sh/kernel/topology.c
@@ -29,7 +29,7 @@ static int __init topology_init(void)
                 ret = register_cpu(&per_cpu(cpu_devices, i), i);
                 if (unlikely(ret))
                         printk(KERN_WARNING "%s: register_cpu %d failed (%d)\n",
-                               __FUNCTION__, i, ret);
+                               __func__, i, ret);
         }
 
 #if defined(CONFIG_NUMA) && !defined(CONFIG_SMP)
diff --git a/arch/sh/kernel/traps_64.c b/arch/sh/kernel/traps_64.c
index a55ac81d795b..1b58a7499087 100644
--- a/arch/sh/kernel/traps_64.c
+++ b/arch/sh/kernel/traps_64.c
@@ -238,7 +238,7 @@ DO_ERROR(12, SIGILL,  "reserved instruction", reserved_inst, current)
 /* Called with interrupts disabled */
 asmlinkage void do_exception_error(unsigned long ex, struct pt_regs *regs)
 {
-        show_excp_regs(__FUNCTION__, -1, -1, regs);
+        show_excp_regs(__func__, -1, -1, regs);
         die_if_kernel("exception", regs, ex);
 }