Message ID | 1260366004-27366-1-git-send-email-vapier@gentoo.org |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
On Wed, 9 Dec 2009, Mike Frysinger wrote: > Local flags variables will be declared whenever these functions get used, > but obviously on UP systems the flags parameter won't be touched. So add > some dummy ops that get optimized away anyways to satisfy gcc's warnings. > > Signed-off-by: Mike Frysinger <vapier@gentoo.org> Acked-by: Nicolas Pitre <nico@fluxnic.net> > --- > drivers/net/smc91x.c | 6 +++--- > 1 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/net/smc91x.c b/drivers/net/smc91x.c > index ae4983a..b0c92b6 100644 > --- a/drivers/net/smc91x.c > +++ b/drivers/net/smc91x.c > @@ -534,9 +534,9 @@ static inline void smc_rcv(struct net_device *dev) > #define smc_special_lock(lock, flags) spin_lock_irqsave(lock, flags) > #define smc_special_unlock(lock, flags) spin_unlock_irqrestore(lock, flags) > #else > -#define smc_special_trylock(lock, flags) (1) > -#define smc_special_lock(lock, flags) do { } while (0) > -#define smc_special_unlock(lock, flags) do { } while (0) > +#define smc_special_trylock(lock, flags) (flags == flags) > +#define smc_special_lock(lock, flags) do { flags = 0; } while (0) > +#define smc_special_unlock(lock, flags) do { flags = 0; } while (0) > #endif > > /* > -- > 1.6.5.5 > -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Mike Frysinger <vapier@gentoo.org> Date: Wed, 9 Dec 2009 08:40:04 -0500 > Local flags variables will be declared whenever these functions get used, > but obviously on UP systems the flags parameter won't be touched. So add > some dummy ops that get optimized away anyways to satisfy gcc's warnings. > > Signed-off-by: Mike Frysinger <vapier@gentoo.org> Applied, although I thought we had a standard macro to handle this kind of case. In any case, for future reference, the usual way to handle this is usually "(void) var;" -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/smc91x.c b/drivers/net/smc91x.c index ae4983a..b0c92b6 100644 --- a/drivers/net/smc91x.c +++ b/drivers/net/smc91x.c @@ -534,9 +534,9 @@ static inline void smc_rcv(struct net_device *dev) #define smc_special_lock(lock, flags) spin_lock_irqsave(lock, flags) #define smc_special_unlock(lock, flags) spin_unlock_irqrestore(lock, flags) #else -#define smc_special_trylock(lock, flags) (1) -#define smc_special_lock(lock, flags) do { } while (0) -#define smc_special_unlock(lock, flags) do { } while (0) +#define smc_special_trylock(lock, flags) (flags == flags) +#define smc_special_lock(lock, flags) do { flags = 0; } while (0) +#define smc_special_unlock(lock, flags) do { flags = 0; } while (0) #endif /*
Local flags variables will be declared whenever these functions get used, but obviously on UP systems the flags parameter won't be touched. So add some dummy ops that get optimized away anyways to satisfy gcc's warnings. Signed-off-by: Mike Frysinger <vapier@gentoo.org> --- drivers/net/smc91x.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)