tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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>

authored by

Harvey Harrison and committed by
Greg Kroah-Hartman 2ae5a6d2 a14eddda

+5 -5
+1 -1
drivers/staging/usbip/usbip_common.c
··· 221 221 static void usbip_dump_usb_ctrlrequest(struct usb_ctrlrequest *cmd) 222 222 { 223 223 if (!cmd) { 224 - printk(" %s : null pointer\n", __FUNCTION__); 224 + printk(" %s : null pointer\n", __func__); 225 225 return; 226 226 } 227 227
+4 -4
drivers/staging/wlan-ng/wlan_compat.h
··· 245 245 # define preempt_count() (0UL) 246 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 254 #define WLAN_LOG_INFO(args... ) printk(KERN_INFO args) 255 255 ··· 265 265 #define DBFENTER { if ( WLAN_DBVAR >= 5 ){ WLAN_LOG_DEBUG(3,"---->\n"); } } 266 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 269 #else 270 270 #define WLAN_ASSERT(c) 271 271 #define WLAN_HEX_DUMP( l, s, p, n)