aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sh
diff options
context:
space:
mode:
authorHarvey Harrison <harvey.harrison@gmail.com>2008-03-04 18:23:47 -0500
committerPaul Mundt <lethal@linux-sh.org>2008-03-05 21:18:22 -0500
commit866e6b9e5019e210d96ced31fbae531ed756e486 (patch)
tree2750282fb2fddcfa609ac8579afdb776177cff90 /arch/sh
parentad0caae0ded1af2a0a41f93356587e1c24d76725 (diff)
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>
Diffstat (limited to 'arch/sh')
-rw-r--r--arch/sh/boards/renesas/x3proto/ilsel.c2
-rw-r--r--arch/sh/boards/superh/microdev/io.c2
-rw-r--r--arch/sh/kernel/cpu/sh4/sq.c4
-rw-r--r--arch/sh/kernel/cpu/sh5/unwind.c2
-rw-r--r--arch/sh/kernel/timers/timer-cmt.c2
-rw-r--r--arch/sh/kernel/timers/timer-mtu2.c2
-rw-r--r--arch/sh/kernel/topology.c2
-rw-r--r--arch/sh/kernel/traps_64.c2
-rw-r--r--arch/sh/lib64/c-checksum.c2
-rw-r--r--arch/sh/mm/init.c2
-rw-r--r--arch/sh/mm/ioremap_32.c2
-rw-r--r--arch/sh/mm/ioremap_64.c4
-rw-r--r--arch/sh/mm/tlbflush_64.c6
13 files changed, 17 insertions, 17 deletions
diff --git a/arch/sh/boards/renesas/x3proto/ilsel.c b/arch/sh/boards/renesas/x3proto/ilsel.c
index 6d4454fef97c..b5c673c39337 100644
--- 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)
68 shift = mk_ilsel_shift(bit); 68 shift = mk_ilsel_shift(bit);
69 69
70 pr_debug("%s: bit#%d: addr - 0x%08lx (shift %d, set %d)\n", 70 pr_debug("%s: bit#%d: addr - 0x%08lx (shift %d, set %d)\n",
71 __FUNCTION__, bit, addr, shift, set); 71 __func__, bit, addr, shift, set);
72 72
73 tmp = ctrl_inw(addr); 73 tmp = ctrl_inw(addr);
74 tmp &= ~(0xf << shift); 74 tmp &= ~(0xf << shift);
diff --git a/arch/sh/boards/superh/microdev/io.c b/arch/sh/boards/superh/microdev/io.c
index b704e20d7e4d..9f8a540f7e14 100644
--- 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)
127 * safe default. 127 * safe default.
128 */ 128 */
129 printk("Warning: unexpected port in %s( offset = 0x%lx )\n", 129 printk("Warning: unexpected port in %s( offset = 0x%lx )\n",
130 __FUNCTION__, offset); 130 __func__, offset);
131 result = PVR; 131 result = PVR;
132 } 132 }
133 133
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)
216 216
217 if (unlikely(!map)) { 217 if (unlikely(!map)) {
218 printk("%s: bad store queue address 0x%08lx\n", 218 printk("%s: bad store queue address 0x%08lx\n",
219 __FUNCTION__, vaddr); 219 __func__, vaddr);
220 return; 220 return;
221 } 221 }
222 222
@@ -233,7 +233,7 @@ void sq_unmap(unsigned long vaddr)
233 vma = remove_vm_area((void *)(map->sq_addr & PAGE_MASK)); 233 vma = remove_vm_area((void *)(map->sq_addr & PAGE_MASK));
234 if (!vma) { 234 if (!vma) {
235 printk(KERN_ERR "%s: bad address 0x%08lx\n", 235 printk(KERN_ERR "%s: bad address 0x%08lx\n",
236 __FUNCTION__, map->sq_addr); 236 __func__, map->sq_addr);
237 return; 237 return;
238 } 238 }
239 } 239 }
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,
149 if (dest >= 63) { 149 if (dest >= 63) {
150 printk(KERN_NOTICE "%s: Invalid dest reg %d " 150 printk(KERN_NOTICE "%s: Invalid dest reg %d "
151 "specified in movi handler. Failed " 151 "specified in movi handler. Failed "
152 "opcode was 0x%lx: ", __FUNCTION__, 152 "opcode was 0x%lx: ", __func__,
153 dest, op); 153 dest, op);
154 154
155 continue; 155 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)
77 count -= LATCH; 77 count -= LATCH;
78 } else { 78 } else {
79 printk("%s (): hardware timer problem?\n", 79 printk("%s (): hardware timer problem?\n",
80 __FUNCTION__); 80 __func__);
81 } 81 }
82 } 82 }
83 } else 83 } 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)
76 count -= LATCH; 76 count -= LATCH;
77 } else { 77 } else {
78 printk("%s (): hardware timer problem?\n", 78 printk("%s (): hardware timer problem?\n",
79 __FUNCTION__); 79 __func__);
80 } 80 }
81 } 81 }
82 } else 82 } 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)
29 ret = register_cpu(&per_cpu(cpu_devices, i), i); 29 ret = register_cpu(&per_cpu(cpu_devices, i), i);
30 if (unlikely(ret)) 30 if (unlikely(ret))
31 printk(KERN_WARNING "%s: register_cpu %d failed (%d)\n", 31 printk(KERN_WARNING "%s: register_cpu %d failed (%d)\n",
32 __FUNCTION__, i, ret); 32 __func__, i, ret);
33 } 33 }
34 34
35#if defined(CONFIG_NUMA) && !defined(CONFIG_SMP) 35#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)
238/* Called with interrupts disabled */ 238/* Called with interrupts disabled */
239asmlinkage void do_exception_error(unsigned long ex, struct pt_regs *regs) 239asmlinkage void do_exception_error(unsigned long ex, struct pt_regs *regs)
240{ 240{
241 show_excp_regs(__FUNCTION__, -1, -1, regs); 241 show_excp_regs(__func__, -1, -1, regs);
242 die_if_kernel("exception", regs, ex); 242 die_if_kernel("exception", regs, ex);
243} 243}
244 244
diff --git a/arch/sh/lib64/c-checksum.c b/arch/sh/lib64/c-checksum.c
index 5dfbd8b5e558..5c284e0cff9c 100644
--- 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,
207 result = (result & 0xffffffff) + (result >> 32); 207 result = (result & 0xffffffff) + (result >> 32);
208 208
209 pr_debug("%s saddr %x daddr %x len %x proto %x sum %x result %08Lx\n", 209 pr_debug("%s saddr %x daddr %x len %x proto %x sum %x result %08Lx\n",
210 __FUNCTION__, saddr, daddr, len, proto, sum, result); 210 __func__, saddr, daddr, len, proto, sum, result);
211 211
212 return (__wsum)result; 212 return (__wsum)result;
213} 213}
diff --git a/arch/sh/mm/init.c b/arch/sh/mm/init.c
index e2ed6dd252b9..53dde0607362 100644
--- 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)
328 /* We only have ZONE_NORMAL, so this is easy.. */ 328 /* We only have ZONE_NORMAL, so this is easy.. */
329 ret = __add_pages(pgdat->node_zones + ZONE_NORMAL, start_pfn, nr_pages); 329 ret = __add_pages(pgdat->node_zones + ZONE_NORMAL, start_pfn, nr_pages);
330 if (unlikely(ret)) 330 if (unlikely(ret))
331 printk("%s: Failed, __add_pages() == %d\n", __FUNCTION__, ret); 331 printk("%s: Failed, __add_pages() == %d\n", __func__, ret);
332 332
333 return ret; 333 return ret;
334} 334}
diff --git a/arch/sh/mm/ioremap_32.c b/arch/sh/mm/ioremap_32.c
index 0c7b7e33abdc..882a32ebc6b7 100644
--- a/arch/sh/mm/ioremap_32.c
+++ b/arch/sh/mm/ioremap_32.c
@@ -141,7 +141,7 @@ void __iounmap(void __iomem *addr)
141 141
142 p = remove_vm_area((void *)(vaddr & PAGE_MASK)); 142 p = remove_vm_area((void *)(vaddr & PAGE_MASK));
143 if (!p) { 143 if (!p) {
144 printk(KERN_ERR "%s: bad address %p\n", __FUNCTION__, addr); 144 printk(KERN_ERR "%s: bad address %p\n", __func__, addr);
145 return; 145 return;
146 } 146 }
147 147
diff --git a/arch/sh/mm/ioremap_64.c b/arch/sh/mm/ioremap_64.c
index e27d16519235..cea224c3e49b 100644
--- 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,
178 } else { 178 } else {
179 if (!printed_full) { 179 if (!printed_full) {
180 printk("%s: done with statics, switching to kmalloc\n", 180 printk("%s: done with statics, switching to kmalloc\n",
181 __FUNCTION__); 181 __func__);
182 printed_full = 1; 182 printed_full = 1;
183 } 183 }
184 tlen = strlen(name); 184 tlen = strlen(name);
@@ -352,7 +352,7 @@ void onchip_unmap(unsigned long vaddr)
352 res = shmedia_find_resource(&shmedia_iomap, vaddr); 352 res = shmedia_find_resource(&shmedia_iomap, vaddr);
353 if (!res) { 353 if (!res) {
354 printk(KERN_ERR "%s: Failed to free 0x%08lx\n", 354 printk(KERN_ERR "%s: Failed to free 0x%08lx\n",
355 __FUNCTION__, vaddr); 355 __func__, vaddr);
356 return; 356 return;
357 } 357 }
358 358
diff --git a/arch/sh/mm/tlbflush_64.c b/arch/sh/mm/tlbflush_64.c
index 2a98c9ec88ff..7876997ba19a 100644
--- 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,
131#ifdef DEBUG_FAULT 131#ifdef DEBUG_FAULT
132 print_task(tsk); 132 print_task(tsk);
133 printk("%s:%d fault, address is 0x%08x PC %016Lx textaccess %d writeaccess %d\n", 133 printk("%s:%d fault, address is 0x%08x PC %016Lx textaccess %d writeaccess %d\n",
134 __FUNCTION__,__LINE__, 134 __func__, __LINE__,
135 address,regs->pc,textaccess,writeaccess); 135 address,regs->pc,textaccess,writeaccess);
136 show_regs(regs); 136 show_regs(regs);
137#endif 137#endif
@@ -145,7 +145,7 @@ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long writeaccess,
145#ifdef DEBUG_FAULT 145#ifdef DEBUG_FAULT
146 print_task(tsk); 146 print_task(tsk);
147 printk("%s:%d fault, address is 0x%08x PC %016Lx textaccess %d writeaccess %d\n", 147 printk("%s:%d fault, address is 0x%08x PC %016Lx textaccess %d writeaccess %d\n",
148 __FUNCTION__,__LINE__, 148 __func__, __LINE__,
149 address,regs->pc,textaccess,writeaccess); 149 address,regs->pc,textaccess,writeaccess);
150 show_regs(regs); 150 show_regs(regs);
151 151
@@ -157,7 +157,7 @@ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long writeaccess,
157#ifdef DEBUG_FAULT 157#ifdef DEBUG_FAULT
158 print_task(tsk); 158 print_task(tsk);
159 printk("%s:%d fault, address is 0x%08x PC %016Lx textaccess %d writeaccess %d\n", 159 printk("%s:%d fault, address is 0x%08x PC %016Lx textaccess %d writeaccess %d\n",
160 __FUNCTION__,__LINE__, 160 __func__, __LINE__,
161 address,regs->pc,textaccess,writeaccess); 161 address,regs->pc,textaccess,writeaccess);
162 show_regs(regs); 162 show_regs(regs);
163#endif 163#endif