Commit c5b2cd97 authored Mar 14, 2016 by Arnd Bergmann Committed by Greg Kroah-Hartman Nov 10, 2016

smc91x: avoid self-comparison warning



commit e3ebd894f084255fde19116955ba7054858ff5d6 upstream.

The smc91x driver defines a macro that compares its argument to
itself, apparently to get a true result while using its argument
to avoid a warning about unused local variables.

Unfortunately, this triggers a warning with gcc-6, as the comparison
is obviously useless:

drivers/net/ethernet/smsc/smc91x.c: In function 'smc_hardware_send_pkt':
drivers/net/ethernet/smsc/smc91x.c:563:14: error: self-comparison always evaluates to true [-Werror=tautological-compare]
  if (!smc_special_trylock(&lp->lock, flags)) {

This replaces the macro with another one that behaves similarly,
with a cast to (void) to ensure the argument is used, and using
a literal 'true' as its value.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 603c7800

drivers/net/ethernet/smsc/smc91x.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -540,7 +540,7 @@ 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) (flags == flags)
		#define smc_special_trylock(lock, flags) ((void)flags, true)
		#define smc_special_lock(lock, flags) do { flags = 0; } while (0)
		#define smc_special_unlock(lock, flags) do { flags = 0; } while (0)
		#endif