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>
This commit is contained in:
parent
ad0caae0de
commit
866e6b9e50
|
@ -68,7 +68,7 @@ static void __ilsel_enable(ilsel_source_t set, unsigned int bit)
|
||||||
shift = mk_ilsel_shift(bit);
|
shift = mk_ilsel_shift(bit);
|
||||||
|
|
||||||
pr_debug("%s: bit#%d: addr - 0x%08lx (shift %d, set %d)\n",
|
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 = ctrl_inw(addr);
|
||||||
tmp &= ~(0xf << shift);
|
tmp &= ~(0xf << shift);
|
||||||
|
|
|
@ -127,7 +127,7 @@ static unsigned long microdev_isa_port2addr(unsigned long offset)
|
||||||
* safe default.
|
* safe default.
|
||||||
*/
|
*/
|
||||||
printk("Warning: unexpected port in %s( offset = 0x%lx )\n",
|
printk("Warning: unexpected port in %s( offset = 0x%lx )\n",
|
||||||
__FUNCTION__, offset);
|
__func__, offset);
|
||||||
result = PVR;
|
result = PVR;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -216,7 +216,7 @@ void sq_unmap(unsigned long vaddr)
|
||||||
|
|
||||||
if (unlikely(!map)) {
|
if (unlikely(!map)) {
|
||||||
printk("%s: bad store queue address 0x%08lx\n",
|
printk("%s: bad store queue address 0x%08lx\n",
|
||||||
__FUNCTION__, vaddr);
|
__func__, vaddr);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -233,7 +233,7 @@ void sq_unmap(unsigned long vaddr)
|
||||||
vma = remove_vm_area((void *)(map->sq_addr & PAGE_MASK));
|
vma = remove_vm_area((void *)(map->sq_addr & PAGE_MASK));
|
||||||
if (!vma) {
|
if (!vma) {
|
||||||
printk(KERN_ERR "%s: bad address 0x%08lx\n",
|
printk(KERN_ERR "%s: bad address 0x%08lx\n",
|
||||||
__FUNCTION__, map->sq_addr);
|
__func__, map->sq_addr);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -149,7 +149,7 @@ static int lookup_prev_stack_frame(unsigned long fp, unsigned long pc,
|
||||||
if (dest >= 63) {
|
if (dest >= 63) {
|
||||||
printk(KERN_NOTICE "%s: Invalid dest reg %d "
|
printk(KERN_NOTICE "%s: Invalid dest reg %d "
|
||||||
"specified in movi handler. Failed "
|
"specified in movi handler. Failed "
|
||||||
"opcode was 0x%lx: ", __FUNCTION__,
|
"opcode was 0x%lx: ", __func__,
|
||||||
dest, op);
|
dest, op);
|
||||||
|
|
||||||
continue;
|
continue;
|
||||||
|
|
|
@ -77,7 +77,7 @@ static unsigned long cmt_timer_get_offset(void)
|
||||||
count -= LATCH;
|
count -= LATCH;
|
||||||
} else {
|
} else {
|
||||||
printk("%s (): hardware timer problem?\n",
|
printk("%s (): hardware timer problem?\n",
|
||||||
__FUNCTION__);
|
__func__);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else
|
} else
|
||||||
|
|
|
@ -76,7 +76,7 @@ static unsigned long mtu2_timer_get_offset(void)
|
||||||
count -= LATCH;
|
count -= LATCH;
|
||||||
} else {
|
} else {
|
||||||
printk("%s (): hardware timer problem?\n",
|
printk("%s (): hardware timer problem?\n",
|
||||||
__FUNCTION__);
|
__func__);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else
|
} else
|
||||||
|
|
|
@ -29,7 +29,7 @@ static int __init topology_init(void)
|
||||||
ret = register_cpu(&per_cpu(cpu_devices, i), i);
|
ret = register_cpu(&per_cpu(cpu_devices, i), i);
|
||||||
if (unlikely(ret))
|
if (unlikely(ret))
|
||||||
printk(KERN_WARNING "%s: register_cpu %d failed (%d)\n",
|
printk(KERN_WARNING "%s: register_cpu %d failed (%d)\n",
|
||||||
__FUNCTION__, i, ret);
|
__func__, i, ret);
|
||||||
}
|
}
|
||||||
|
|
||||||
#if defined(CONFIG_NUMA) && !defined(CONFIG_SMP)
|
#if defined(CONFIG_NUMA) && !defined(CONFIG_SMP)
|
||||||
|
|
|
@ -238,7 +238,7 @@ DO_ERROR(12, SIGILL, "reserved instruction", reserved_inst, current)
|
||||||
/* Called with interrupts disabled */
|
/* Called with interrupts disabled */
|
||||||
asmlinkage void do_exception_error(unsigned long ex, struct pt_regs *regs)
|
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);
|
die_if_kernel("exception", regs, ex);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -207,7 +207,7 @@ __wsum csum_tcpudp_nofold(__be32 saddr, __be32 daddr,
|
||||||
result = (result & 0xffffffff) + (result >> 32);
|
result = (result & 0xffffffff) + (result >> 32);
|
||||||
|
|
||||||
pr_debug("%s saddr %x daddr %x len %x proto %x sum %x result %08Lx\n",
|
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;
|
return (__wsum)result;
|
||||||
}
|
}
|
||||||
|
|
|
@ -328,7 +328,7 @@ int arch_add_memory(int nid, u64 start, u64 size)
|
||||||
/* We only have ZONE_NORMAL, so this is easy.. */
|
/* We only have ZONE_NORMAL, so this is easy.. */
|
||||||
ret = __add_pages(pgdat->node_zones + ZONE_NORMAL, start_pfn, nr_pages);
|
ret = __add_pages(pgdat->node_zones + ZONE_NORMAL, start_pfn, nr_pages);
|
||||||
if (unlikely(ret))
|
if (unlikely(ret))
|
||||||
printk("%s: Failed, __add_pages() == %d\n", __FUNCTION__, ret);
|
printk("%s: Failed, __add_pages() == %d\n", __func__, ret);
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
|
@ -141,7 +141,7 @@ void __iounmap(void __iomem *addr)
|
||||||
|
|
||||||
p = remove_vm_area((void *)(vaddr & PAGE_MASK));
|
p = remove_vm_area((void *)(vaddr & PAGE_MASK));
|
||||||
if (!p) {
|
if (!p) {
|
||||||
printk(KERN_ERR "%s: bad address %p\n", __FUNCTION__, addr);
|
printk(KERN_ERR "%s: bad address %p\n", __func__, addr);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -178,7 +178,7 @@ static unsigned long shmedia_alloc_io(unsigned long phys, unsigned long size,
|
||||||
} else {
|
} else {
|
||||||
if (!printed_full) {
|
if (!printed_full) {
|
||||||
printk("%s: done with statics, switching to kmalloc\n",
|
printk("%s: done with statics, switching to kmalloc\n",
|
||||||
__FUNCTION__);
|
__func__);
|
||||||
printed_full = 1;
|
printed_full = 1;
|
||||||
}
|
}
|
||||||
tlen = strlen(name);
|
tlen = strlen(name);
|
||||||
|
@ -352,7 +352,7 @@ void onchip_unmap(unsigned long vaddr)
|
||||||
res = shmedia_find_resource(&shmedia_iomap, vaddr);
|
res = shmedia_find_resource(&shmedia_iomap, vaddr);
|
||||||
if (!res) {
|
if (!res) {
|
||||||
printk(KERN_ERR "%s: Failed to free 0x%08lx\n",
|
printk(KERN_ERR "%s: Failed to free 0x%08lx\n",
|
||||||
__FUNCTION__, vaddr);
|
__func__, vaddr);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -131,7 +131,7 @@ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long writeaccess,
|
||||||
#ifdef DEBUG_FAULT
|
#ifdef DEBUG_FAULT
|
||||||
print_task(tsk);
|
print_task(tsk);
|
||||||
printk("%s:%d fault, address is 0x%08x PC %016Lx textaccess %d writeaccess %d\n",
|
printk("%s:%d fault, address is 0x%08x PC %016Lx textaccess %d writeaccess %d\n",
|
||||||
__FUNCTION__,__LINE__,
|
__func__, __LINE__,
|
||||||
address,regs->pc,textaccess,writeaccess);
|
address,regs->pc,textaccess,writeaccess);
|
||||||
show_regs(regs);
|
show_regs(regs);
|
||||||
#endif
|
#endif
|
||||||
|
@ -145,7 +145,7 @@ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long writeaccess,
|
||||||
#ifdef DEBUG_FAULT
|
#ifdef DEBUG_FAULT
|
||||||
print_task(tsk);
|
print_task(tsk);
|
||||||
printk("%s:%d fault, address is 0x%08x PC %016Lx textaccess %d writeaccess %d\n",
|
printk("%s:%d fault, address is 0x%08x PC %016Lx textaccess %d writeaccess %d\n",
|
||||||
__FUNCTION__,__LINE__,
|
__func__, __LINE__,
|
||||||
address,regs->pc,textaccess,writeaccess);
|
address,regs->pc,textaccess,writeaccess);
|
||||||
show_regs(regs);
|
show_regs(regs);
|
||||||
|
|
||||||
|
@ -157,7 +157,7 @@ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long writeaccess,
|
||||||
#ifdef DEBUG_FAULT
|
#ifdef DEBUG_FAULT
|
||||||
print_task(tsk);
|
print_task(tsk);
|
||||||
printk("%s:%d fault, address is 0x%08x PC %016Lx textaccess %d writeaccess %d\n",
|
printk("%s:%d fault, address is 0x%08x PC %016Lx textaccess %d writeaccess %d\n",
|
||||||
__FUNCTION__,__LINE__,
|
__func__, __LINE__,
|
||||||
address,regs->pc,textaccess,writeaccess);
|
address,regs->pc,textaccess,writeaccess);
|
||||||
show_regs(regs);
|
show_regs(regs);
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in a new issue