diff options
author | Harvey Harrison <harvey.harrison@gmail.com> | 2008-10-20 18:45:25 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-10-22 12:56:36 -0400 |
commit | 2ae5a6d20eae3651eade5165ae2a30ea6c3a1812 (patch) | |
tree | 0c8dc327590f5fdd2b51daa74f2ddc6fda64c445 | |
parent | a14edddac99eff625cfcb44829ce206ec04be71a (diff) |
Staging: remove remaining uses of __FUNCTION__
__FUNCTION__ is gcc-specific, use __func__
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | drivers/staging/usbip/usbip_common.c | 2 | ||||
-rw-r--r-- | drivers/staging/wlan-ng/wlan_compat.h | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/drivers/staging/usbip/usbip_common.c b/drivers/staging/usbip/usbip_common.c index e64918f42ff..72e209276ea 100644 --- a/drivers/staging/usbip/usbip_common.c +++ b/drivers/staging/usbip/usbip_common.c | |||
@@ -221,7 +221,7 @@ static void usbip_dump_request_type(__u8 rt) | |||
221 | static void usbip_dump_usb_ctrlrequest(struct usb_ctrlrequest *cmd) | 221 | static void usbip_dump_usb_ctrlrequest(struct usb_ctrlrequest *cmd) |
222 | { | 222 | { |
223 | if (!cmd) { | 223 | if (!cmd) { |
224 | printk(" %s : null pointer\n", __FUNCTION__); | 224 | printk(" %s : null pointer\n", __func__); |
225 | return; | 225 | return; |
226 | } | 226 | } |
227 | 227 | ||
diff --git a/drivers/staging/wlan-ng/wlan_compat.h b/drivers/staging/wlan-ng/wlan_compat.h index 17026570708..59dfa8f84cb 100644 --- a/drivers/staging/wlan-ng/wlan_compat.h +++ b/drivers/staging/wlan-ng/wlan_compat.h | |||
@@ -245,11 +245,11 @@ typedef int64_t INT64; | |||
245 | # define preempt_count() (0UL) | 245 | # define preempt_count() (0UL) |
246 | #endif | 246 | #endif |
247 | 247 | ||
248 | #define WLAN_LOG_ERROR(x,args...) printk(KERN_ERR "%s: " x , __FUNCTION__ , ##args); | 248 | #define WLAN_LOG_ERROR(x,args...) printk(KERN_ERR "%s: " x , __func__ , ##args); |
249 | 249 | ||
250 | #define WLAN_LOG_WARNING(x,args...) printk(KERN_WARNING "%s: " x , __FUNCTION__ , ##args); | 250 | #define WLAN_LOG_WARNING(x,args...) printk(KERN_WARNING "%s: " x , __func__ , ##args); |
251 | 251 | ||
252 | #define WLAN_LOG_NOTICE(x,args...) printk(KERN_NOTICE "%s: " x , __FUNCTION__ , ##args); | 252 | #define WLAN_LOG_NOTICE(x,args...) printk(KERN_NOTICE "%s: " x , __func__ , ##args); |
253 | 253 | ||
254 | #define WLAN_LOG_INFO(args... ) printk(KERN_INFO args) | 254 | #define WLAN_LOG_INFO(args... ) printk(KERN_INFO args) |
255 | 255 | ||
@@ -265,7 +265,7 @@ typedef int64_t INT64; | |||
265 | #define DBFENTER { if ( WLAN_DBVAR >= 5 ){ WLAN_LOG_DEBUG(3,"---->\n"); } } | 265 | #define DBFENTER { if ( WLAN_DBVAR >= 5 ){ WLAN_LOG_DEBUG(3,"---->\n"); } } |
266 | #define DBFEXIT { if ( WLAN_DBVAR >= 5 ){ WLAN_LOG_DEBUG(3,"<----\n"); } } | 266 | #define DBFEXIT { if ( WLAN_DBVAR >= 5 ){ WLAN_LOG_DEBUG(3,"<----\n"); } } |
267 | 267 | ||
268 | #define WLAN_LOG_DEBUG(l,x,args...) if ( WLAN_DBVAR >= (l)) printk(KERN_DEBUG "%s(%lu): " x , __FUNCTION__, (preempt_count() & PREEMPT_MASK), ##args ); | 268 | #define WLAN_LOG_DEBUG(l,x,args...) if ( WLAN_DBVAR >= (l)) printk(KERN_DEBUG "%s(%lu): " x , __func__, (preempt_count() & PREEMPT_MASK), ##args ); |
269 | #else | 269 | #else |
270 | #define WLAN_ASSERT(c) | 270 | #define WLAN_ASSERT(c) |
271 | #define WLAN_HEX_DUMP( l, s, p, n) | 271 | #define WLAN_HEX_DUMP( l, s, p, n) |