提交 0b491eee 编写于 作者: S Steve Glendinning 提交者: David S. Miller

usbnet: allow type check of devdbg arguments in non-debug build

Improve usbnet's devdbg to always type-check diagnostic arguments,
like dev_dbg (device.h).  This makes no change to the resulting size of
usbnet modules.

This patch also removes an #ifdef DEBUG directive from rndis_wlan so
it's devdbg statements are always type-checked at compile time.
Signed-off-by: NSteve Glendinning <steve.glendinning@smsc.com>
Signed-off-by: NDavid Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 748085fc
...@@ -1649,9 +1649,7 @@ static char *rndis_translate_scan(struct net_device *dev, ...@@ -1649,9 +1649,7 @@ static char *rndis_translate_scan(struct net_device *dev,
char *end_buf, char *end_buf,
struct ndis_80211_bssid_ex *bssid) struct ndis_80211_bssid_ex *bssid)
{ {
#ifdef DEBUG
struct usbnet *usbdev = netdev_priv(dev); struct usbnet *usbdev = netdev_priv(dev);
#endif
u8 *ie; u8 *ie;
char *current_val; char *current_val;
int bssid_len, ie_len, i; int bssid_len, ie_len, i;
......
...@@ -197,7 +197,9 @@ extern int usbnet_nway_reset(struct net_device *net); ...@@ -197,7 +197,9 @@ extern int usbnet_nway_reset(struct net_device *net);
#define devdbg(usbnet, fmt, arg...) \ #define devdbg(usbnet, fmt, arg...) \
printk(KERN_DEBUG "%s: " fmt "\n" , (usbnet)->net->name , ## arg) printk(KERN_DEBUG "%s: " fmt "\n" , (usbnet)->net->name , ## arg)
#else #else
#define devdbg(usbnet, fmt, arg...) do {} while(0) #define devdbg(usbnet, fmt, arg...) \
({ if (0) printk(KERN_DEBUG "%s: " fmt "\n" , (usbnet)->net->name , \
## arg); 0; })
#endif #endif
#define deverr(usbnet, fmt, arg...) \ #define deverr(usbnet, fmt, arg...) \
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册