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

[PATCH 1/1] 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>
---
 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.5.5.1

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

[Jeff Garzik]

Steve Glendinning wrote:
> 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>
> ---
>  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

applied

[patch 2.6.29-rc] usbnet: allow type check of devdbg arguments in non-debug build

[David Brownell]

From: Steve Glendinning <steve.glendinning@smsc.com>
Subject: 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.

Signed-off-by: Steve Glendinning <steve.glendinning@smsc.com>
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
---
[ refreshed against 2.6.29-rc1 GIT ]

 include/linux/usb/usbnet.h |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- a/include/linux/usb/usbnet.h
+++ b/include/linux/usb/usbnet.h
@@ -197,7 +197,9 @@ extern int usbnet_nway_reset(struct 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...) \

Re: [patch 2.6.29-rc] usbnet: allow type check of devdbg arguments in non-debug build

[David Miller]

From: David Brownell <david-b@pacbell.net>
Date: Fri, 16 Jan 2009 23:19:44 -0800

> 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>

Applied, thanks.

Re: [patch 2.6.29-rc] usbnet: allow type check of devdbg arguments in non-debug build

[David Miller]

From: David Miller <davem@davemloft.net>
Date: Mon, 19 Jan 2009 17:12:00 -0800 (PST)

> From: David Brownell <david-b@pacbell.net>
> Date: Fri, 16 Jan 2009 23:19:44 -0800
> 
> > 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>
> 
> Applied, thanks.

I have to back this out, it breaks the build:

drivers/net/wireless/rndis_wlan.c: In function 'rndis_translate_scan':
drivers/net/wireless/rndis_wlan.c:1664: error: 'usbdev' undeclared (first use in this function)
drivers/net/wireless/rndis_wlan.c:1664: error: (Each undeclared identifier is reported only once
drivers/net/wireless/rndis_wlan.c:1664: error: for each function it appears in.)
make[3]: *** [drivers/net/wireless/rndis_wlan.o] Error 1
make[3]: *** Waiting for unfinished jobs....
make[2]: *** [drivers/net/wireless] Error 2
make[2]: *** Waiting for unfinished jobs....

I bet there are other similar gremlins like this in the tree.

Re: [patch 2.6.29-rc] usbnet: allow type check of devdbg arguments in non-debug build

[David Brownell]

On Monday 19 January 2009, David Miller wrote:
> From: David Miller <davem@davemloft.net>
> Date: Mon, 19 Jan 2009 17:12:00 -0800 (PST)
> 
> > From: David Brownell <david-b@pacbell.net>
> > Date: Fri, 16 Jan 2009 23:19:44 -0800
> > 
> > > 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>
> > 
> > Applied, thanks.
> 
> I have to back this out, it breaks the build:
> 
> drivers/net/wireless/rndis_wlan.c: In function 'rndis_translate_scan':
> drivers/net/wireless/rndis_wlan.c:1664: error: 'usbdev' undeclared (first use in this function)
> drivers/net/wireless/rndis_wlan.c:1664: error: (Each undeclared identifier is reported only once
> drivers/net/wireless/rndis_wlan.c:1664: error: for each function it appears in.)
> make[3]: *** [drivers/net/wireless/rndis_wlan.o] Error 1
> make[3]: *** Waiting for unfinished jobs....
> make[2]: *** [drivers/net/wireless] Error 2
> make[2]: *** Waiting for unfinished jobs....
> 
> I bet there are other similar gremlins like this in the tree.

Maybe, but that's after all part of why we want this kind
of patch merged ... after the first gremlines are fixed!

In this case I'll guess this is the root cause of the bug:

#ifdef DEBUG
        struct usbnet *usbdev = netdev_priv(dev);
#endif

 
CC'd someone more involved in rndis_wlan than me ...

- Dave

Re: [patch 2.6.29-rc] usbnet: allow type check of devdbg arguments in non-debug build

[David Miller]

From: David Brownell <david-b@pacbell.net>
Date: Mon, 19 Jan 2009 18:04:08 -0800

> Maybe, but that's after all part of why we want this kind
> of patch merged ... after the first gremlines are fixed!

When you submit a change like this that can have
potential warning and build failure effects across
the entire tree, the onus is on you to do an
allmodconfig sanity check build or similar and
add any necessary fixes to your change.

Re: [patch 2.6.29-rc] usbnet: allow type check of devdbg arguments in non-debug build

[David Brownell]

On Monday 19 January 2009, David Miller wrote:
> > Maybe, but that's after all part of why we want this kind
> > of patch merged ... after the first gremlines are fixed!
> 
> When you submit a change like this that can have
> potential warning and build failure effects across
> the entire tree, the onus is on you to do an
> allmodconfig sanity check build or similar and
> add any necessary fixes to your change.

It's actually Steve's patch ... Steve?

Re: [patch 2.6.29-rc] usbnet: allow type check of devdbg arguments in non-debug build

[Steve.Glendinning]

David Brownell <david-b@pacbell.net> wrote on 20/01/2009 05:11:48:
> On Monday 19 January 2009, David Miller wrote:
> > > Maybe, but that's after all part of why we want this kind
> > > of patch merged ... after the first gremlines are fixed!
> > 
> > When you submit a change like this that can have
> > potential warning and build failure effects across
> > the entire tree, the onus is on you to do an
> > allmodconfig sanity check build or similar and
> > add any necessary fixes to your change.
> 
> It's actually Steve's patch ... Steve?
> 

Sorry, my bad - I tested compilation of usbnet drivers in
drivers/net/usb but missed this wireless usbnet driver hiding
in drivers/net/wireless.  allmodconfig was what i was looking
for, thanks David!

I've fixed this compilation breakage now, updated patchset to
follow.

Steve

Re: [patch 2.6.29-rc] usbnet: allow type check of devdbg arguments in non-debug build

[David Miller]

From: Steve.Glendinning@smsc.com
Date: Tue, 20 Jan 2009 10:56:09 +0000

> I've fixed this compilation breakage now, updated patchset to
> follow.

But you added a new warning for the non-DEBUG case during the
intermediate steps between the patches.

Please respin this all into a single patch in order to make the
transition cleanly, for all cases.