diff options
author | Harvey Harrison <harvey.harrison@gmail.com> | 2008-04-28 05:14:40 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-28 11:58:34 -0400 |
commit | 156f1ed640170d70c9fc8e5f6f797ea1f2a1653b (patch) | |
tree | 4709685cf46fce1ef552ccbee6d30f5073f99216 /drivers/isdn/hisax/st5481.h | |
parent | dd58c0dd30ac761837b1d0d8cc434c7ec7b2df68 (diff) |
isdn: replace remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc-specific, use __func__
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Cc: Karsten Keil <kkeil@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/isdn/hisax/st5481.h')
-rw-r--r-- | drivers/isdn/hisax/st5481.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/isdn/hisax/st5481.h b/drivers/isdn/hisax/st5481.h index 04416bad611d..2044e7173ab4 100644 --- a/drivers/isdn/hisax/st5481.h +++ b/drivers/isdn/hisax/st5481.h | |||
@@ -218,13 +218,13 @@ enum { | |||
218 | #define L1_EVENT_COUNT (EV_TIMER3 + 1) | 218 | #define L1_EVENT_COUNT (EV_TIMER3 + 1) |
219 | 219 | ||
220 | #define ERR(format, arg...) \ | 220 | #define ERR(format, arg...) \ |
221 | printk(KERN_ERR "%s:%s: " format "\n" , __FILE__, __FUNCTION__ , ## arg) | 221 | printk(KERN_ERR "%s:%s: " format "\n" , __FILE__, __func__ , ## arg) |
222 | 222 | ||
223 | #define WARN(format, arg...) \ | 223 | #define WARN(format, arg...) \ |
224 | printk(KERN_WARNING "%s:%s: " format "\n" , __FILE__, __FUNCTION__ , ## arg) | 224 | printk(KERN_WARNING "%s:%s: " format "\n" , __FILE__, __func__ , ## arg) |
225 | 225 | ||
226 | #define INFO(format, arg...) \ | 226 | #define INFO(format, arg...) \ |
227 | printk(KERN_INFO "%s:%s: " format "\n" , __FILE__, __FUNCTION__ , ## arg) | 227 | printk(KERN_INFO "%s:%s: " format "\n" , __FILE__, __func__ , ## arg) |
228 | 228 | ||
229 | #include "isdnhdlc.h" | 229 | #include "isdnhdlc.h" |
230 | #include "fsm.h" | 230 | #include "fsm.h" |
@@ -406,7 +406,7 @@ struct st5481_adapter { | |||
406 | 406 | ||
407 | /* | 407 | /* |
408 | * Submit an URB with error reporting. This is a macro so | 408 | * Submit an URB with error reporting. This is a macro so |
409 | * the __FUNCTION__ returns the caller function name. | 409 | * the __func__ returns the caller function name. |
410 | */ | 410 | */ |
411 | #define SUBMIT_URB(urb, mem_flags) \ | 411 | #define SUBMIT_URB(urb, mem_flags) \ |
412 | ({ \ | 412 | ({ \ |
@@ -470,7 +470,7 @@ extern int st5481_debug; | |||
470 | #ifdef CONFIG_HISAX_DEBUG | 470 | #ifdef CONFIG_HISAX_DEBUG |
471 | 471 | ||
472 | #define DBG_ISO_PACKET(level,urb) \ | 472 | #define DBG_ISO_PACKET(level,urb) \ |
473 | if (level & __debug_variable) dump_iso_packet(__FUNCTION__,urb) | 473 | if (level & __debug_variable) dump_iso_packet(__func__,urb) |
474 | 474 | ||
475 | static void __attribute__((unused)) | 475 | static void __attribute__((unused)) |
476 | dump_iso_packet(const char *name, struct urb *urb) | 476 | dump_iso_packet(const char *name, struct urb *urb) |