diff options
author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
---|---|---|
committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
tree | 644b88f8a71896307d71438e9b3af49126ffb22b /drivers/net/jme.h | |
parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'drivers/net/jme.h')
-rw-r--r-- | drivers/net/jme.h | 43 |
1 files changed, 8 insertions, 35 deletions
diff --git a/drivers/net/jme.h b/drivers/net/jme.h index 251abed3817e..07ad3a457185 100644 --- a/drivers/net/jme.h +++ b/drivers/net/jme.h | |||
@@ -25,7 +25,7 @@ | |||
25 | #define __JME_H_INCLUDED__ | 25 | #define __JME_H_INCLUDED__ |
26 | 26 | ||
27 | #define DRV_NAME "jme" | 27 | #define DRV_NAME "jme" |
28 | #define DRV_VERSION "1.0.5" | 28 | #define DRV_VERSION "1.0.6" |
29 | #define PFX DRV_NAME ": " | 29 | #define PFX DRV_NAME ": " |
30 | 30 | ||
31 | #define PCI_DEVICE_ID_JMICRON_JMC250 0x0250 | 31 | #define PCI_DEVICE_ID_JMICRON_JMC250 0x0250 |
@@ -45,43 +45,16 @@ | |||
45 | printk(KERN_ERR PFX fmt, ## args) | 45 | printk(KERN_ERR PFX fmt, ## args) |
46 | 46 | ||
47 | #ifdef TX_DEBUG | 47 | #ifdef TX_DEBUG |
48 | #define tx_dbg(priv, fmt, args...) \ | 48 | #define tx_dbg(priv, fmt, args...) \ |
49 | printk(KERN_DEBUG "%s: " fmt, (priv)->dev->name, ## args) | 49 | printk(KERN_DEBUG "%s: " fmt, (priv)->dev->name, ##args) |
50 | #else | 50 | #else |
51 | #define tx_dbg(priv, fmt, args...) | 51 | #define tx_dbg(priv, fmt, args...) \ |
52 | do { \ | ||
53 | if (0) \ | ||
54 | printk(KERN_DEBUG "%s: " fmt, (priv)->dev->name, ##args); \ | ||
55 | } while (0) | ||
52 | #endif | 56 | #endif |
53 | 57 | ||
54 | #define jme_msg(msglvl, type, priv, fmt, args...) \ | ||
55 | if (netif_msg_##type(priv)) \ | ||
56 | printk(msglvl "%s: " fmt, (priv)->dev->name, ## args) | ||
57 | |||
58 | #define msg_probe(priv, fmt, args...) \ | ||
59 | jme_msg(KERN_INFO, probe, priv, fmt, ## args) | ||
60 | |||
61 | #define msg_link(priv, fmt, args...) \ | ||
62 | jme_msg(KERN_INFO, link, priv, fmt, ## args) | ||
63 | |||
64 | #define msg_intr(priv, fmt, args...) \ | ||
65 | jme_msg(KERN_INFO, intr, priv, fmt, ## args) | ||
66 | |||
67 | #define msg_rx_err(priv, fmt, args...) \ | ||
68 | jme_msg(KERN_ERR, rx_err, priv, fmt, ## args) | ||
69 | |||
70 | #define msg_rx_status(priv, fmt, args...) \ | ||
71 | jme_msg(KERN_INFO, rx_status, priv, fmt, ## args) | ||
72 | |||
73 | #define msg_tx_err(priv, fmt, args...) \ | ||
74 | jme_msg(KERN_ERR, tx_err, priv, fmt, ## args) | ||
75 | |||
76 | #define msg_tx_done(priv, fmt, args...) \ | ||
77 | jme_msg(KERN_INFO, tx_done, priv, fmt, ## args) | ||
78 | |||
79 | #define msg_tx_queued(priv, fmt, args...) \ | ||
80 | jme_msg(KERN_INFO, tx_queued, priv, fmt, ## args) | ||
81 | |||
82 | #define msg_hw(priv, fmt, args...) \ | ||
83 | jme_msg(KERN_ERR, hw, priv, fmt, ## args) | ||
84 | |||
85 | /* | 58 | /* |
86 | * Extra PCI Configuration space interface | 59 | * Extra PCI Configuration space interface |
87 | */ | 60 | */ |