Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dd4683da authored by Joe Perches's avatar Joe Perches Committed by David S. Miller
Browse files

drivers/net/ipg: Remove invalid IPG_DDEBUG_MSG uses, neaten 



Some no longer valid IPG_DDEBUG_MSG uses are removed
Validate IPG_DDEBUG_MSG arguments when not #defined
Neaten #defines
marco/macro typo correction

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 02cdce53

drivers/net/ipg.c

+0 −5
Original line number Diff line number Diff line
@@ -1547,8 +1547,6 @@ static void ipg_reset_after_host_error(struct work_struct *work) 
		container_of(work, struct ipg_nic_private, task.work);

	struct net_device *dev = sp->dev;



	IPG_DDEBUG_MSG("DMACtrl = %8.8x\n", ioread32(sp->ioaddr + IPG_DMACTRL));



	/*

	 * Acknowledge HostError interrupt by resetting

	 * IPG DMA and HOST.
@@ -1825,9 +1823,6 @@ static int ipg_nic_stop(struct net_device *dev) 


	netif_stop_queue(dev);



	IPG_DDEBUG_MSG("RFDlistendCount = %i\n", sp->RFDlistendCount);

	IPG_DDEBUG_MSG("RFDListCheckedCount = %i\n", sp->rxdCheckedCount);

	IPG_DDEBUG_MSG("EmptyRFDListCount = %i\n", sp->EmptyRFDListCount);

	IPG_DUMPTFDLIST(dev);



	do {

drivers/net/ipg.h

+61 −48
Original line number Diff line number Diff line
@@ -653,15 +653,28 @@ enum ipg_regs { 
 * Miscellaneous macros.

 */



/* Marco for printing debug statements. */

/* Macros for printing debug statements. */

#ifdef IPG_DEBUG

#  define IPG_DEBUG_MSG(args...)

#  define IPG_DDEBUG_MSG(args...) printk(KERN_DEBUG "IPG: " args)

#  define IPG_DEBUG_MSG(fmt, args...)			\

do {							\

	if (0)						\

		printk(KERN_DEBUG "IPG: " fmt, ##args);	\

} while (0)

#  define IPG_DDEBUG_MSG(fmt, args...)			\

	printk(KERN_DEBUG "IPG: " fmt, ##args)

#  define IPG_DUMPRFDLIST(args) ipg_dump_rfdlist(args)

#  define IPG_DUMPTFDLIST(args) ipg_dump_tfdlist(args)

#else

#  define IPG_DEBUG_MSG(args...)

#  define IPG_DDEBUG_MSG(args...)

#  define IPG_DEBUG_MSG(fmt, args...)			\

do {							\

	if (0)						\

		printk(KERN_DEBUG "IPG: " fmt, ##args);	\

} while (0)

#  define IPG_DDEBUG_MSG(fmt, args...)			\

do {							\

	if (0)						\

		printk(KERN_DEBUG "IPG: " fmt, ##args);	\

} while (0)

#  define IPG_DUMPRFDLIST(args)

#  define IPG_DUMPTFDLIST(args)

#endif