hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Joe Perches 2010-03-28 08:35:45 +00:00 committed by David S. Miller
parent 02cdce53f3
commit dd4683daed
2 changed files with 61 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/net/ipg.c
View File

@ -1547,8 +1547,6 @@ static void ipg_reset_after_host_error(struct work_struct *work)
container_of(work, struct ipg_nic_private, task.work); container_of(work, struct ipg_nic_private, task.work);
struct net_device *dev = sp->dev; struct net_device *dev = sp->dev;
IPG_DDEBUG_MSG("DMACtrl = %8.8x\n", ioread32(sp->ioaddr + IPG_DMACTRL));
/* /*
* Acknowledge HostError interrupt by resetting * Acknowledge HostError interrupt by resetting
* IPG DMA and HOST. * IPG DMA and HOST.
@ -1825,9 +1823,6 @@ static int ipg_nic_stop(struct net_device *dev)
netif_stop_queue(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); IPG_DUMPTFDLIST(dev);
do { do {

23
drivers/net/ipg.h
View File

@ -653,15 +653,28 @@ enum ipg_regs {
* Miscellaneous macros. * Miscellaneous macros.
*/ */
/* Marco for printing debug statements. */ /* Macros for printing debug statements. */
#ifdef IPG_DEBUG #ifdef IPG_DEBUG
# define IPG_DEBUG_MSG(args...) # define IPG_DEBUG_MSG(fmt, args...) \
# define IPG_DDEBUG_MSG(args...) printk(KERN_DEBUG "IPG: " 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_DUMPRFDLIST(args) ipg_dump_rfdlist(args)
# define IPG_DUMPTFDLIST(args) ipg_dump_tfdlist(args) # define IPG_DUMPTFDLIST(args) ipg_dump_tfdlist(args)
#else #else
# define IPG_DEBUG_MSG(args...) # define IPG_DEBUG_MSG(fmt, args...) \
# define IPG_DDEBUG_MSG(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_DUMPRFDLIST(args)
# define IPG_DUMPTFDLIST(args) # define IPG_DUMPTFDLIST(args)
#endif #endif