diff options
| author | Harvey Harrison <harvey.harrison@gmail.com> | 2008-04-28 05:13:49 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-28 11:58:27 -0400 |
| commit | f85e7cdc3fd0db65ef1442476b82ced0f01c5c19 (patch) | |
| tree | 866f0adcf99b25207b8f649d75002a114ba1cdee | |
| parent | 6feef6e5f23d5a3d8a614ab8ea392dfa54c7365c (diff) | |
m68k: replace remaining __FUNCTION__ occurrences
__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>
| -rw-r--r-- | arch/m68k/kernel/ints.c | 10 | ||||
| -rw-r--r-- | arch/m68k/mac/oss.c | 4 | ||||
| -rw-r--r-- | arch/m68k/q40/q40ints.c | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/arch/m68k/kernel/ints.c b/arch/m68k/kernel/ints.c index 2b412454cb41..ded7dd2f67b2 100644 --- a/arch/m68k/kernel/ints.c +++ b/arch/m68k/kernel/ints.c | |||
| @@ -186,7 +186,7 @@ int setup_irq(unsigned int irq, struct irq_node *node) | |||
| 186 | 186 | ||
| 187 | if (irq >= NR_IRQS || !(contr = irq_controller[irq])) { | 187 | if (irq >= NR_IRQS || !(contr = irq_controller[irq])) { |
| 188 | printk("%s: Incorrect IRQ %d from %s\n", | 188 | printk("%s: Incorrect IRQ %d from %s\n", |
| 189 | __FUNCTION__, irq, node->devname); | 189 | __func__, irq, node->devname); |
| 190 | return -ENXIO; | 190 | return -ENXIO; |
| 191 | } | 191 | } |
| 192 | 192 | ||
| @@ -249,7 +249,7 @@ void free_irq(unsigned int irq, void *dev_id) | |||
| 249 | unsigned long flags; | 249 | unsigned long flags; |
| 250 | 250 | ||
| 251 | if (irq >= NR_IRQS || !(contr = irq_controller[irq])) { | 251 | if (irq >= NR_IRQS || !(contr = irq_controller[irq])) { |
| 252 | printk("%s: Incorrect IRQ %d\n", __FUNCTION__, irq); | 252 | printk("%s: Incorrect IRQ %d\n", __func__, irq); |
| 253 | return; | 253 | return; |
| 254 | } | 254 | } |
| 255 | 255 | ||
| @@ -267,7 +267,7 @@ void free_irq(unsigned int irq, void *dev_id) | |||
| 267 | node->handler = NULL; | 267 | node->handler = NULL; |
| 268 | } else | 268 | } else |
| 269 | printk("%s: Removing probably wrong IRQ %d\n", | 269 | printk("%s: Removing probably wrong IRQ %d\n", |
| 270 | __FUNCTION__, irq); | 270 | __func__, irq); |
| 271 | 271 | ||
| 272 | if (!irq_list[irq]) { | 272 | if (!irq_list[irq]) { |
| 273 | if (contr->shutdown) | 273 | if (contr->shutdown) |
| @@ -288,7 +288,7 @@ void enable_irq(unsigned int irq) | |||
| 288 | 288 | ||
| 289 | if (irq >= NR_IRQS || !(contr = irq_controller[irq])) { | 289 | if (irq >= NR_IRQS || !(contr = irq_controller[irq])) { |
| 290 | printk("%s: Incorrect IRQ %d\n", | 290 | printk("%s: Incorrect IRQ %d\n", |
| 291 | __FUNCTION__, irq); | 291 | __func__, irq); |
| 292 | return; | 292 | return; |
| 293 | } | 293 | } |
| 294 | 294 | ||
| @@ -312,7 +312,7 @@ void disable_irq(unsigned int irq) | |||
| 312 | 312 | ||
| 313 | if (irq >= NR_IRQS || !(contr = irq_controller[irq])) { | 313 | if (irq >= NR_IRQS || !(contr = irq_controller[irq])) { |
| 314 | printk("%s: Incorrect IRQ %d\n", | 314 | printk("%s: Incorrect IRQ %d\n", |
| 315 | __FUNCTION__, irq); | 315 | __func__, irq); |
| 316 | return; | 316 | return; |
| 317 | } | 317 | } |
| 318 | 318 | ||
diff --git a/arch/m68k/mac/oss.c b/arch/m68k/mac/oss.c index 50603d3dce84..3c943d2ec570 100644 --- a/arch/m68k/mac/oss.c +++ b/arch/m68k/mac/oss.c | |||
| @@ -190,7 +190,7 @@ void oss_irq_enable(int irq) { | |||
| 190 | break; | 190 | break; |
| 191 | #ifdef DEBUG_IRQUSE | 191 | #ifdef DEBUG_IRQUSE |
| 192 | default: | 192 | default: |
| 193 | printk("%s unknown irq %d\n",__FUNCTION__, irq); | 193 | printk("%s unknown irq %d\n", __func__, irq); |
| 194 | break; | 194 | break; |
| 195 | #endif | 195 | #endif |
| 196 | } | 196 | } |
| @@ -230,7 +230,7 @@ void oss_irq_disable(int irq) { | |||
| 230 | break; | 230 | break; |
| 231 | #ifdef DEBUG_IRQUSE | 231 | #ifdef DEBUG_IRQUSE |
| 232 | default: | 232 | default: |
| 233 | printk("%s unknown irq %d\n", __FUNCTION__, irq); | 233 | printk("%s unknown irq %d\n", __func__, irq); |
| 234 | break; | 234 | break; |
| 235 | #endif | 235 | #endif |
| 236 | } | 236 | } |
diff --git a/arch/m68k/q40/q40ints.c b/arch/m68k/q40/q40ints.c index 46161cef08b9..9f0e3d59bf92 100644 --- a/arch/m68k/q40/q40ints.c +++ b/arch/m68k/q40/q40ints.c | |||
| @@ -47,7 +47,7 @@ static int q40_irq_startup(unsigned int irq) | |||
| 47 | switch (irq) { | 47 | switch (irq) { |
| 48 | case 1: case 2: case 8: case 9: | 48 | case 1: case 2: case 8: case 9: |
| 49 | case 11: case 12: case 13: | 49 | case 11: case 12: case 13: |
| 50 | printk("%s: ISA IRQ %d not implemented by HW\n", __FUNCTION__, irq); | 50 | printk("%s: ISA IRQ %d not implemented by HW\n", __func__, irq); |
| 51 | return -ENXIO; | 51 | return -ENXIO; |
| 52 | } | 52 | } |
| 53 | return 0; | 53 | return 0; |
