Staging: remove remaining uses of __FUNCTION__ (2ae5a6d2) · Commits · 戴 / test

drivers/staging/usbip/usbip_common.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -221,7 +221,7 @@ static void usbip_dump_request_type(__u8 rt)
		static void usbip_dump_usb_ctrlrequest(struct usb_ctrlrequest *cmd)
		{
		if (!cmd) {
		printk(" %s : null pointer\n", __FUNCTION__);
		printk(" %s : null pointer\n", __func__);
		return;
		}

+4 −4

Original line number	Diff line number	Diff line
		@@ -245,11 +245,11 @@ typedef int64_t INT64;
		# define preempt_count() (0UL)
		#endif

		#define WLAN_LOG_ERROR(x,args...) printk(KERN_ERR "%s: " x , __FUNCTION__ , ##args);
		#define WLAN_LOG_ERROR(x,args...) printk(KERN_ERR "%s: " x , __func__ , ##args);

		#define WLAN_LOG_WARNING(x,args...) printk(KERN_WARNING "%s: " x , __FUNCTION__ , ##args);
		#define WLAN_LOG_WARNING(x,args...) printk(KERN_WARNING "%s: " x , __func__ , ##args);

		#define WLAN_LOG_NOTICE(x,args...) printk(KERN_NOTICE "%s: " x , __FUNCTION__ , ##args);
		#define WLAN_LOG_NOTICE(x,args...) printk(KERN_NOTICE "%s: " x , __func__ , ##args);

		#define WLAN_LOG_INFO(args... ) printk(KERN_INFO args)

		@@ -265,7 +265,7 @@ typedef int64_t INT64;
		#define DBFENTER { if ( WLAN_DBVAR >= 5 ){ WLAN_LOG_DEBUG(3,"---->\n"); } }
		#define DBFEXIT { if ( WLAN_DBVAR >= 5 ){ WLAN_LOG_DEBUG(3,"<----\n"); } }

		#define WLAN_LOG_DEBUG(l,x,args...) if ( WLAN_DBVAR >= (l)) printk(KERN_DEBUG "%s(%lu): " x , __FUNCTION__, (preempt_count() & PREEMPT_MASK), ##args );
		#define WLAN_LOG_DEBUG(l,x,args...) if ( WLAN_DBVAR >= (l)) printk(KERN_DEBUG "%s(%lu): " x , __func__, (preempt_count() & PREEMPT_MASK), ##args );
		#else
		#define WLAN_ASSERT(c)
		#define WLAN_HEX_DUMP( l, s, p, n)