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>

diff --git a/arch/sh/boards/renesas/x3proto/ilsel.c b/arch/sh/boards/renesas/x3proto/ilsel.c
index 6d4454fef97c948e3ba9640ced74c636e326adcc..b5c673c39337ef14fb6b7b7ab99de0b6d838c0c6 100644 (file)
--- a/arch/sh/boards/renesas/x3proto/ilsel.c
+++ b/arch/sh/boards/renesas/x3proto/ilsel.c
@@ -68,7 +68,7 @@ static void __ilsel_enable(ilsel_source_t set, unsigned int bit)
        shift = mk_ilsel_shift(bit);
 
        pr_debug("%s: bit#%d: addr - 0x%08lx (shift %d, set %d)\n",
-                __FUNCTION__, bit, addr, shift, set);
+                __func__, bit, addr, shift, set);
 
        tmp = ctrl_inw(addr);
        tmp &= ~(0xf << shift);

diff --git a/arch/sh/boards/superh/microdev/io.c b/arch/sh/boards/superh/microdev/io.c
index b704e20d7e4dccf35ac9c5b3c614577840f5ec80..9f8a540f7e141d0ee61f9094c7d9436fc1135b1c 100644 (file)
--- a/arch/sh/boards/superh/microdev/io.c
+++ b/arch/sh/boards/superh/microdev/io.c
@@ -127,7 +127,7 @@ static unsigned long microdev_isa_port2addr(unsigned long offset)
                         *      safe default.
                         */
                printk("Warning: unexpected port in %s( offset = 0x%lx )\n",
-                      __FUNCTION__, offset);
+                      __func__, offset);
                result = PVR;
        }
 

diff --git a/arch/sh/kernel/cpu/sh4/sq.c b/arch/sh/kernel/cpu/sh4/sq.c
index 8250e017bd4eaac43989cfa037be64b4c59688fe..9561b02ade0ef84e0b1a904c0a89891517ef77b2 100644 (file)
--- 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 119c20afd4e5afb0d9d8803c2d94f2b5747e7d15..b205b25eaf45d6d6b0b791703ee83fe3f9e45f8b 100644 (file)
--- 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 71312324b5defb4383d4760ecfd12f196fd52b7e..d20c8c3758817981549ac4fce5e47d7dafc2ffa7 100644 (file)
--- 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 ade9d6eb29f9e92ce40ab774db506e6e9817d817..fe453c01f9c9d533ab4d3fd5e4e1356c4bba6aa8 100644 (file)
--- 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 9b5844a1bdaaa814d951b07da66fb848a9a94e5c..0838942b70837f715634e80d099e9f31b0f99001 100644 (file)
--- 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 a55ac81d795bd393a10caf8b394592815b0a8a01..1b58a749908739d4a3224ee5eb7eef33bc51c565 100644 (file)
--- 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);
 }
 

diff --git a/arch/sh/lib64/c-checksum.c b/arch/sh/lib64/c-checksum.c
index 5dfbd8b5e5586b9e1c344ff3497e0b3a5cb8e182..5c284e0cff9c66c0fd298de301e173da94d99c97 100644 (file)
--- a/arch/sh/lib64/c-checksum.c
+++ b/arch/sh/lib64/c-checksum.c
@@ -207,7 +207,7 @@ __wsum csum_tcpudp_nofold(__be32 saddr, __be32 daddr,
        result = (result & 0xffffffff) + (result >> 32);
 
        pr_debug("%s saddr %x daddr %x len %x proto %x sum %x result %08Lx\n",
-               __FUNCTION__, saddr, daddr, len, proto, sum, result);
+               __func__, saddr, daddr, len, proto, sum, result);
 
        return (__wsum)result;
 }

diff --git a/arch/sh/mm/init.c b/arch/sh/mm/init.c
index e2ed6dd252b9f1ca71c9c566ec2978897d3ba6d0..53dde06073627d693d431fd308e6c647d87da30e 100644 (file)
--- a/arch/sh/mm/init.c
+++ b/arch/sh/mm/init.c
@@ -328,7 +328,7 @@ int arch_add_memory(int nid, u64 start, u64 size)
        /* We only have ZONE_NORMAL, so this is easy.. */
        ret = __add_pages(pgdat->node_zones + ZONE_NORMAL, start_pfn, nr_pages);
        if (unlikely(ret))
-               printk("%s: Failed, __add_pages() == %d\n", __FUNCTION__, ret);
+               printk("%s: Failed, __add_pages() == %d\n", __func__, ret);
 
        return ret;
 }

diff --git a/arch/sh/mm/ioremap_32.c b/arch/sh/mm/ioremap_32.c
index 0c7b7e33abdcfd6e2ddf242623683d3ee89d7b6c..882a32ebc6b7c593c303a4d711cce5ae03001222 100644 (file)
--- a/arch/sh/mm/ioremap_32.c
+++ b/arch/sh/mm/ioremap_32.c
@@ -141,7 +141,7 @@ void __iounmap(void __iomem *addr)
 
        p = remove_vm_area((void *)(vaddr & PAGE_MASK));
        if (!p) {
-               printk(KERN_ERR "%s: bad address %p\n", __FUNCTION__, addr);
+               printk(KERN_ERR "%s: bad address %p\n", __func__, addr);
                return;
        }
 

diff --git a/arch/sh/mm/ioremap_64.c b/arch/sh/mm/ioremap_64.c
index e27d165192354cda7d827b5a11ecac3207c9d802..cea224c3e49b6049b54edd6d5a6e782a02728dc2 100644 (file)
--- a/arch/sh/mm/ioremap_64.c
+++ b/arch/sh/mm/ioremap_64.c
@@ -178,7 +178,7 @@ static unsigned long shmedia_alloc_io(unsigned long phys, unsigned long size,
         } else {
                 if (!printed_full) {
                         printk("%s: done with statics, switching to kmalloc\n",
-                              __FUNCTION__);
+                              __func__);
                         printed_full = 1;
                 }
                 tlen = strlen(name);
@@ -352,7 +352,7 @@ void onchip_unmap(unsigned long vaddr)
        res = shmedia_find_resource(&shmedia_iomap, vaddr);
        if (!res) {
                printk(KERN_ERR "%s: Failed to free 0x%08lx\n",
-                      __FUNCTION__, vaddr);
+                      __func__, vaddr);
                return;
        }
 

diff --git a/arch/sh/mm/tlbflush_64.c b/arch/sh/mm/tlbflush_64.c
index 2a98c9ec88ff49c48d919aa696f8700b72901dcf..7876997ba19a829f50941757ba6807bd93d3b3d4 100644 (file)
--- a/arch/sh/mm/tlbflush_64.c
+++ b/arch/sh/mm/tlbflush_64.c
@@ -131,7 +131,7 @@ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long writeaccess,
 #ifdef DEBUG_FAULT
                print_task(tsk);
                printk("%s:%d fault, address is 0x%08x PC %016Lx textaccess %d writeaccess %d\n",
-                      __FUNCTION__,__LINE__,
+                      __func__, __LINE__,
                       address,regs->pc,textaccess,writeaccess);
                show_regs(regs);
 #endif
@@ -145,7 +145,7 @@ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long writeaccess,
 #ifdef DEBUG_FAULT
                print_task(tsk);
                printk("%s:%d fault, address is 0x%08x PC %016Lx textaccess %d writeaccess %d\n",
-                      __FUNCTION__,__LINE__,
+                      __func__, __LINE__,
                       address,regs->pc,textaccess,writeaccess);
                show_regs(regs);
 
@@ -157,7 +157,7 @@ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long writeaccess,
 #ifdef DEBUG_FAULT
                print_task(tsk);
                printk("%s:%d fault, address is 0x%08x PC %016Lx textaccess %d writeaccess %d\n",
-                      __FUNCTION__,__LINE__,
+                      __func__, __LINE__,
                       address,regs->pc,textaccess,writeaccess);
                show_regs(regs);
 #endif