diff options
author | Joe Perches <joe@perches.com> | 2010-02-09 06:49:51 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-02-12 16:27:46 -0500 |
commit | f8502ce4f986a8fd486302980285b5e786b8dabe (patch) | |
tree | 072ba56d57cfebc285b0e443e1eb9f3d125a7e4c /drivers/net/jme.h | |
parent | bf82c189a92f06967cf790d3ab0fc9827a9d00ff (diff) |
drivers/net/jme: Use netif_printk helpers
Convert uses of msg_<type> to netif_<level>(
Remove msg_<type> macros
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/jme.h')
-rw-r--r-- | drivers/net/jme.h | 41 |
1 files changed, 7 insertions, 34 deletions
diff --git a/drivers/net/jme.h b/drivers/net/jme.h index 251abed3817e..c19db9146a2f 100644 --- a/drivers/net/jme.h +++ b/drivers/net/jme.h | |||
@@ -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 | */ |