[PATCH 1/2] rndis_wlan: allow devdbg arguments to be type-checked without DEBUG

[PATCH 1/2] rndis_wlan: allow devdbg arguments to be type-checked without DEBUG

[Steve Glendinning]

This patch removes an #ifdef DEBUG directive so devdbg statements can be
type-checked at compile time.  Type checking itself is introduced by
another patch in this series.

This introduces an unused variable warning which disappears with the
type-checking patch.

Signed-off-by: Steve Glendinning <steve.glendinning@smsc.com>
---
 drivers/net/wireless/rndis_wlan.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/drivers/net/wireless/rndis_wlan.c b/drivers/net/wireless/rndis_wlan.c
index 607ce9f..ed93ac4 100644
--- a/drivers/net/wireless/rndis_wlan.c
+++ b/drivers/net/wireless/rndis_wlan.c
@@ -1649,9 +1649,7 @@ static char *rndis_translate_scan(struct net_device *dev,
 				  char *end_buf,
 				  struct ndis_80211_bssid_ex *bssid)
 {
-#ifdef DEBUG
 	struct usbnet *usbdev = netdev_priv(dev);
-#endif
 	u8 *ie;
 	char *current_val;
 	int bssid_len, ie_len, i;
-- 
1.6.0.6

[PATCH 2/2] usbnet: allow type check of devdbg arguments in non-debug build

[Steve Glendinning]

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.

Signed-off-by: Steve Glendinning <steve.glendinning@smsc.com>
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
---
 include/linux/usb/usbnet.h |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/include/linux/usb/usbnet.h b/include/linux/usb/usbnet.h
index ba09fe8..7d38222 100644
--- a/include/linux/usb/usbnet.h
+++ b/include/linux/usb/usbnet.h
@@ -197,7 +197,9 @@ extern int usbnet_nway_reset(struct net_device *net);
 #define devdbg(usbnet, fmt, arg...) \
 	printk(KERN_DEBUG "%s: " fmt "\n" , (usbnet)->net->name , ## arg)
 #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
 
 #define deverr(usbnet, fmt, arg...) \
-- 
1.6.0.6

Re: [PATCH 1/2] rndis_wlan: allow devdbg arguments to be type-checked without DEBUG

[David Miller]

From: Steve Glendinning <steve.glendinning@smsc.com>
Date: Tue, 20 Jan 2009 13:07:17 +0000

> This patch removes an #ifdef DEBUG directive so devdbg statements can be
> type-checked at compile time.  Type checking itself is introduced by
> another patch in this series.
> 
> This introduces an unused variable warning which disappears with the
> type-checking patch.
> 
> Signed-off-by: Steve Glendinning <steve.glendinning@smsc.com>

This adds a warning for the non-DEBUG build.  That's the whole reason
the ifdef is there.

Therefore you must do the devdbg() define change and this ifdef
removal in the same commit.