Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

m68k: replace remaining __FUNCTION__ occurrences

Browse source 
__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>
This commit is contained in:
Harvey Harrison 2008-04-28 02:13:49 -07:00 committed by Linus Torvalds
parent 6feef6e5f2
commit f85e7cdc3f
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
arch/m68k/kernel/ints.c
View file

@ -186,7 +186,7 @@ int setup_irq(unsigned int irq, struct irq_node *node)
if (irq >= NR_IRQS || !(contr = irq_controller[irq])) { if (irq >= NR_IRQS || !(contr = irq_controller[irq])) {
printk("%s: Incorrect IRQ %d from %s\n", printk("%s: Incorrect IRQ %d from %s\n",
__FUNCTION__, irq, node->devname); __func__, irq, node->devname);
return -ENXIO; return -ENXIO;
} }
@ -249,7 +249,7 @@ void free_irq(unsigned int irq, void *dev_id)
unsigned long flags; unsigned long flags;
if (irq >= NR_IRQS || !(contr = irq_controller[irq])) { 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; return;
} }
@ -267,7 +267,7 @@ void free_irq(unsigned int irq, void *dev_id)
node->handler = NULL; node->handler = NULL;
} else } else
printk("%s: Removing probably wrong IRQ %d\n", printk("%s: Removing probably wrong IRQ %d\n",
__FUNCTION__, irq); __func__, irq);
if (!irq_list[irq]) { if (!irq_list[irq]) {
if (contr->shutdown) if (contr->shutdown)
@ -288,7 +288,7 @@ void enable_irq(unsigned int irq)
if (irq >= NR_IRQS || !(contr = irq_controller[irq])) { if (irq >= NR_IRQS || !(contr = irq_controller[irq])) {
printk("%s: Incorrect IRQ %d\n", printk("%s: Incorrect IRQ %d\n",
__FUNCTION__, irq); __func__, irq);
return; return;
} }
@ -312,7 +312,7 @@ void disable_irq(unsigned int irq)
if (irq >= NR_IRQS || !(contr = irq_controller[irq])) { if (irq >= NR_IRQS || !(contr = irq_controller[irq])) {
printk("%s: Incorrect IRQ %d\n", printk("%s: Incorrect IRQ %d\n",
__FUNCTION__, irq); __func__, irq);
return; return;
} }

4
arch/m68k/mac/oss.c
View file

@ -190,7 +190,7 @@ void oss_irq_enable(int irq) {
break; break;
#ifdef DEBUG_IRQUSE #ifdef DEBUG_IRQUSE
default: default:
printk("%s unknown irq %d\n",__FUNCTION__, irq); printk("%s unknown irq %d\n", __func__, irq);
break; break;
#endif #endif
} }
@ -230,7 +230,7 @@ void oss_irq_disable(int irq) {
break; break;
#ifdef DEBUG_IRQUSE #ifdef DEBUG_IRQUSE
default: default:
printk("%s unknown irq %d\n", __FUNCTION__, irq); printk("%s unknown irq %d\n", __func__, irq);
break; break;
#endif #endif
} }

2
arch/m68k/q40/q40ints.c
View file

@ -47,7 +47,7 @@ static int q40_irq_startup(unsigned int irq)
switch (irq) { switch (irq) {
case 1: case 2: case 8: case 9: case 1: case 2: case 8: case 9:
case 11: case 12: case 13: 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 -ENXIO;
} }
return 0; return 0;