diff options
author | Harvey Harrison <harvey.harrison@gmail.com> | 2008-04-22 21:39:01 -0400 |
---|---|---|
committer | Bryan Wu <cooloney@kernel.org> | 2008-04-22 21:39:01 -0400 |
commit | b85d858b40a28107ee50ca9e89f57c0e35c251c6 (patch) | |
tree | 96f1a2a344529e820fb0f256331070be3d83e600 /arch/blackfin/kernel/bfin_gpio.c | |
parent | 6b13483ba2c9c90fc34c79b44be418b56b6a756c (diff) |
[Blackfin] arch: __FUNCTION__ is gcc-specific, use __func__
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Cc: Mike Frysinger <vapier.adi@gmail.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Bryan Wu <cooloney@kernel.org>
Diffstat (limited to 'arch/blackfin/kernel/bfin_gpio.c')
-rw-r--r-- | arch/blackfin/kernel/bfin_gpio.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/blackfin/kernel/bfin_gpio.c b/arch/blackfin/kernel/bfin_gpio.c index b54dad505f83..7e8ceea9b5d1 100644 --- a/arch/blackfin/kernel/bfin_gpio.c +++ b/arch/blackfin/kernel/bfin_gpio.c | |||
@@ -821,7 +821,7 @@ int peripheral_request(unsigned short per, const char *label) | |||
821 | dump_stack(); | 821 | dump_stack(); |
822 | printk(KERN_ERR | 822 | printk(KERN_ERR |
823 | "%s: Peripheral %d is already reserved as GPIO by %s !\n", | 823 | "%s: Peripheral %d is already reserved as GPIO by %s !\n", |
824 | __FUNCTION__, ident, get_label(ident)); | 824 | __func__, ident, get_label(ident)); |
825 | local_irq_restore(flags); | 825 | local_irq_restore(flags); |
826 | return -EBUSY; | 826 | return -EBUSY; |
827 | } | 827 | } |
@@ -848,7 +848,7 @@ int peripheral_request(unsigned short per, const char *label) | |||
848 | dump_stack(); | 848 | dump_stack(); |
849 | printk(KERN_ERR | 849 | printk(KERN_ERR |
850 | "%s: Peripheral %d function %d is already reserved by %s !\n", | 850 | "%s: Peripheral %d function %d is already reserved by %s !\n", |
851 | __FUNCTION__, ident, P_FUNCT2MUX(per), get_label(ident)); | 851 | __func__, ident, P_FUNCT2MUX(per), get_label(ident)); |
852 | local_irq_restore(flags); | 852 | local_irq_restore(flags); |
853 | return -EBUSY; | 853 | return -EBUSY; |
854 | } | 854 | } |
@@ -891,7 +891,7 @@ int peripheral_request(unsigned short per, const char *label) | |||
891 | dump_stack(); | 891 | dump_stack(); |
892 | printk(KERN_ERR | 892 | printk(KERN_ERR |
893 | "%s: Peripheral %d is already reserved as GPIO by %s !\n", | 893 | "%s: Peripheral %d is already reserved as GPIO by %s !\n", |
894 | __FUNCTION__, ident, get_label(ident)); | 894 | __func__, ident, get_label(ident)); |
895 | local_irq_restore(flags); | 895 | local_irq_restore(flags); |
896 | return -EBUSY; | 896 | return -EBUSY; |
897 | } | 897 | } |
@@ -919,7 +919,7 @@ int peripheral_request(unsigned short per, const char *label) | |||
919 | printk(KERN_ERR | 919 | printk(KERN_ERR |
920 | "%s: Peripheral %d function %d is already" | 920 | "%s: Peripheral %d function %d is already" |
921 | " reserved by %s !\n", | 921 | " reserved by %s !\n", |
922 | __FUNCTION__, ident, P_FUNCT2MUX(per), | 922 | __func__, ident, P_FUNCT2MUX(per), |
923 | get_label(ident)); | 923 | get_label(ident)); |
924 | local_irq_restore(flags); | 924 | local_irq_restore(flags); |
925 | return -EBUSY; | 925 | return -EBUSY; |