| Message ID | 20201031004958.1059797-1-andrew@lunn.ch |
|---|---|
| Headers | show |
| Series | smsc W=1 warning fixes | expand |
On Sat, 31 Oct 2020 01:49:55 +0100 Andrew Lunn wrote: > drivers/net/ethernet/smsc/smc911x.c: In function ‘smc911x_timeout’: > drivers/net/ethernet/smsc/smc911x.c:1251:6: warning: variable ‘status’ set but not used [-Wunused-but-set-variable] > 1251 | int status, mask; > > The status is read in order to print it via the DBG macro. However, > due to the way DBG is disabled, the compiler never sees it being used. > > Change the DBG macro to actually make use of the passed parameters, > and the leave the optimiser to remove the unwanted code inside the if > (0). > > Signed-off-by: Andrew Lunn <andrew@lunn.ch> > --- > drivers/net/ethernet/smsc/smc911x.c | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff --git a/drivers/net/ethernet/smsc/smc911x.c b/drivers/net/ethernet/smsc/smc911x.c > index 8f748a0c057e..33d0398c182e 100644 > --- a/drivers/net/ethernet/smsc/smc911x.c > +++ b/drivers/net/ethernet/smsc/smc911x.c > @@ -102,7 +102,11 @@ MODULE_ALIAS("platform:smc911x"); > > #define PRINTK(dev, args...) netdev_info(dev, args) > #else > -#define DBG(n, dev, args...) do { } while (0) > +#define DBG(n, dev, args...) \ > + do { \ > + if (0) \ > + netdev_dbg(dev, args); \ > + } while (0) nit: since you have to respin - while (0) { } would do here.
Fixup various W=1 warnings, and then add COMPILE_TEST support, which explains why these where missed on the previous pass. One of these patches added as a new checkpatch warning, by copy/pasting an existing macro and slightly modifying it. The code already has lots of checkpatch warnings, so one more is not going to make that much difference. Andrew Lunn (7): drivers: net: smc91x: Fix set but unused W=1 warning drivers: net: smc91x: Fix missing kerneldoc reported by W=1 drivers: net: smc911x: Work around set but unused status drivers: net: smc911x: Fix set but unused status because of DBG macro drivers: net: smc911x: Fix passing wrong number of parameters to DBG() macro drivers: net: smc911x: Fix cast from pointer to integer of different size drivers: net: smsc: Add COMPILE_TEST support drivers/net/ethernet/smsc/Kconfig | 6 +++--- drivers/net/ethernet/smsc/smc911x.c | 18 ++++++++++-------- drivers/net/ethernet/smsc/smc91x.c | 10 ++++++++-- drivers/net/ethernet/smsc/smc91x.h | 10 ++++++++++ 4 files changed, 31 insertions(+), 13 deletions(-)