diff options
| author | Harvey Harrison <harvey.harrison@gmail.com> | 2008-03-04 15:08:02 -0800 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-03-06 12:18:18 +0000 |
| commit | 8e86f4271aaac7685923b80cf57972be41afbc1d (patch) | |
| tree | 4817fbfdd60d4cccf6b87876765ce64f044d624a /arch/arm/mach-sa1100/badge4.c | |
| parent | 92df78519d0a6a8677cb827b5a1b7d2520d7e202 (diff) | |
| download | linux-8e86f4271aaac7685923b80cf57972be41afbc1d.tar.gz linux-8e86f4271aaac7685923b80cf57972be41afbc1d.tar.bz2 linux-8e86f4271aaac7685923b80cf57972be41afbc1d.zip | |
[ARM] 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: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-sa1100/badge4.c')
| -rw-r--r-- | arch/arm/mach-sa1100/badge4.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-sa1100/badge4.c b/arch/arm/mach-sa1100/badge4.c index f60b7a66dfa0..842d9e6dc5ff 100644 --- a/arch/arm/mach-sa1100/badge4.c +++ b/arch/arm/mach-sa1100/badge4.c @@ -206,7 +206,7 @@ static int __init badge4_init(void) if (ret < 0) printk(KERN_ERR "%s: SA-1111 initialization failed (%d)\n", - __FUNCTION__, ret); + __func__, ret); /* maybe turn on 5v0 from the start */ @@ -240,11 +240,11 @@ void badge4_set_5V(unsigned subsystem, int on) /* detect on->off and off->on transitions */ if ((!old_5V_bitmap) && (badge4_5V_bitmap)) { /* was off, now on */ - printk(KERN_INFO "%s: enabling 5V supply rail\n", __FUNCTION__); + printk(KERN_INFO "%s: enabling 5V supply rail\n", __func__); GPSR = BADGE4_GPIO_PCMEN5V; } else if ((old_5V_bitmap) && (!badge4_5V_bitmap)) { /* was on, now off */ - printk(KERN_INFO "%s: disabling 5V supply rail\n", __FUNCTION__); + printk(KERN_INFO "%s: disabling 5V supply rail\n", __func__); GPCR = BADGE4_GPIO_PCMEN5V; } |