diff options
author | Harvey Harrison <harvey.harrison@gmail.com> | 2008-04-30 03:54:57 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-30 11:29:53 -0400 |
commit | 145980a0b07520f0f82cc40999acc92b349ea40c (patch) | |
tree | 48bc21442adcda4561b8f5356380cc168d059619 /drivers/sbus | |
parent | bdf4bbaaee3d4b8f555658333cbce1affe9070fb (diff) |
drivers: replace remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc-specific, use __func__
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Cc: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/sbus')
-rw-r--r-- | drivers/sbus/char/cpwatchdog.c | 2 | ||||
-rw-r--r-- | drivers/sbus/char/uctrl.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/sbus/char/cpwatchdog.c b/drivers/sbus/char/cpwatchdog.c index a4e758143665..235703414370 100644 --- a/drivers/sbus/char/cpwatchdog.c +++ b/drivers/sbus/char/cpwatchdog.c | |||
@@ -637,7 +637,7 @@ static int wd_inittimer(int whichdog) | |||
637 | break; | 637 | break; |
638 | default: | 638 | default: |
639 | printk("%s: %s: invalid watchdog id: %i\n", | 639 | printk("%s: %s: invalid watchdog id: %i\n", |
640 | WD_OBPNAME, __FUNCTION__, whichdog); | 640 | WD_OBPNAME, __func__, whichdog); |
641 | return(1); | 641 | return(1); |
642 | } | 642 | } |
643 | if(0 != misc_register(whichmisc)) | 643 | if(0 != misc_register(whichmisc)) |
diff --git a/drivers/sbus/char/uctrl.c b/drivers/sbus/char/uctrl.c index 44d2ef906ac7..383f32c1d347 100644 --- a/drivers/sbus/char/uctrl.c +++ b/drivers/sbus/char/uctrl.c | |||
@@ -393,13 +393,13 @@ static int __init ts102_uctrl_init(void) | |||
393 | err = request_irq(driver->irq, uctrl_interrupt, 0, "uctrl", driver); | 393 | err = request_irq(driver->irq, uctrl_interrupt, 0, "uctrl", driver); |
394 | if (err) { | 394 | if (err) { |
395 | printk("%s: unable to register irq %d\n", | 395 | printk("%s: unable to register irq %d\n", |
396 | __FUNCTION__, driver->irq); | 396 | __func__, driver->irq); |
397 | return err; | 397 | return err; |
398 | } | 398 | } |
399 | 399 | ||
400 | if (misc_register(&uctrl_dev)) { | 400 | if (misc_register(&uctrl_dev)) { |
401 | printk("%s: unable to get misc minor %d\n", | 401 | printk("%s: unable to get misc minor %d\n", |
402 | __FUNCTION__, uctrl_dev.minor); | 402 | __func__, uctrl_dev.minor); |
403 | free_irq(driver->irq, driver); | 403 | free_irq(driver->irq, driver); |
404 | return -ENODEV; | 404 | return -ENODEV; |
405 | } | 405 | } |