include: replace __FUNCTION__ with __func__
__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: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:

committed by
Linus Torvalds

parent
8e9c7716c1
commit
d5c003b4d1
@@ -61,7 +61,7 @@ extern unsigned int p9_debug_level;
|
||||
do { \
|
||||
if ((p9_debug_level & level) == level) \
|
||||
printk(KERN_NOTICE "-- %s (%d): " \
|
||||
format , __FUNCTION__, task_pid_nr(current) , ## arg); \
|
||||
format , __func__, task_pid_nr(current) , ## arg); \
|
||||
} while (0)
|
||||
|
||||
#define PRINT_FCALL_ERROR(s, fcall) P9_DPRINTK(P9_DEBUG_ERROR, \
|
||||
@@ -76,7 +76,7 @@ do { \
|
||||
#define P9_EPRINTK(level, format, arg...) \
|
||||
do { \
|
||||
printk(level "9p: %s (%d): " \
|
||||
format , __FUNCTION__, task_pid_nr(current), ## arg); \
|
||||
format , __func__, task_pid_nr(current), ## arg); \
|
||||
} while (0)
|
||||
|
||||
/**
|
||||
|
@@ -54,8 +54,8 @@
|
||||
#define SOL_RFCOMM 18
|
||||
|
||||
#define BT_INFO(fmt, arg...) printk(KERN_INFO "Bluetooth: " fmt "\n" , ## arg)
|
||||
#define BT_DBG(fmt, arg...) printk(KERN_INFO "%s: " fmt "\n" , __FUNCTION__ , ## arg)
|
||||
#define BT_ERR(fmt, arg...) printk(KERN_ERR "%s: " fmt "\n" , __FUNCTION__ , ## arg)
|
||||
#define BT_DBG(fmt, arg...) printk(KERN_INFO "%s: " fmt "\n" , __func__ , ## arg)
|
||||
#define BT_ERR(fmt, arg...) printk(KERN_ERR "%s: " fmt "\n" , __func__ , ## arg)
|
||||
|
||||
/* Connection and socket states */
|
||||
enum {
|
||||
|
@@ -114,7 +114,7 @@ extern u32 ieee80211_debug_level;
|
||||
#define IEEE80211_DEBUG(level, fmt, args...) \
|
||||
do { if (ieee80211_debug_level & (level)) \
|
||||
printk(KERN_DEBUG "ieee80211: %c %s " fmt, \
|
||||
in_interrupt() ? 'I' : 'U', __FUNCTION__ , ## args); } while (0)
|
||||
in_interrupt() ? 'I' : 'U', __func__ , ## args); } while (0)
|
||||
static inline bool ieee80211_ratelimit_debug(u32 level)
|
||||
{
|
||||
return (ieee80211_debug_level & level) && net_ratelimit();
|
||||
|
@@ -165,13 +165,13 @@ static inline const char *ip_vs_dbg_addr(int af, char *buf, size_t buf_len,
|
||||
do { \
|
||||
if (level <= ip_vs_get_debug_level()) \
|
||||
printk(KERN_DEBUG "Enter: %s, %s line %i\n", \
|
||||
__FUNCTION__, __FILE__, __LINE__); \
|
||||
__func__, __FILE__, __LINE__); \
|
||||
} while (0)
|
||||
#define LeaveFunction(level) \
|
||||
do { \
|
||||
if (level <= ip_vs_get_debug_level()) \
|
||||
printk(KERN_DEBUG "Leave: %s, %s line %i\n", \
|
||||
__FUNCTION__, __FILE__, __LINE__); \
|
||||
__func__, __FILE__, __LINE__); \
|
||||
} while (0)
|
||||
#else
|
||||
#define EnterFunction(level) do {} while (0)
|
||||
|
@@ -72,7 +72,7 @@ do { if (irda_debug >= (n)) \
|
||||
#define IRDA_ASSERT(expr, func) \
|
||||
do { if(!(expr)) { \
|
||||
printk( "Assertion failed! %s:%s:%d %s\n", \
|
||||
__FILE__,__FUNCTION__,__LINE__,(#expr) ); \
|
||||
__FILE__,__func__,__LINE__,(#expr) ); \
|
||||
func } } while (0)
|
||||
#define IRDA_ASSERT_LABEL(label) label
|
||||
#else
|
||||
|
@@ -303,7 +303,7 @@ extern int sctp_debug_flag;
|
||||
#define SCTP_ASSERT(expr, str, func) \
|
||||
if (!(expr)) { \
|
||||
SCTP_DEBUG_PRINTK("Assertion Failed: %s(%s) at %s:%s:%d\n", \
|
||||
str, (#expr), __FILE__, __FUNCTION__, __LINE__); \
|
||||
str, (#expr), __FILE__, __func__, __LINE__); \
|
||||
func; \
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user