diff options
| author | Joe Perches <joe@perches.com> | 2010-02-22 16:56:57 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-02-26 01:38:34 -0800 |
| commit | c1f51212eb809849bdc68a856ae5f424dcf20d9b (patch) | |
| tree | 2a01f9e5201d3fc40527c24961b0f888f9e0ed61 /drivers/net/chelsio/common.h | |
| parent | 003bdb279bb6b212f25ea4e60e0164b6109d3704 (diff) | |
drivers/net/chelsio: Use pr_<level>, netif_msg_<type>
Convert CH_<level> and CH_DBG uses to pr_<level> and netif equivalents
Remove CH_<level> and CH_DBG macro definitions
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/chelsio/common.h')
| -rw-r--r-- | drivers/net/chelsio/common.h | 24 |
1 files changed, 2 insertions, 22 deletions
diff --git a/drivers/net/chelsio/common.h b/drivers/net/chelsio/common.h index 9f89fd60064..2d11afe4531 100644 --- a/drivers/net/chelsio/common.h +++ b/drivers/net/chelsio/common.h @@ -36,6 +36,8 @@ * * ****************************************************************************/ +#define pr_fmt(fmt) "cxgb: " fmt + #ifndef _CXGB_COMMON_H_ #define _CXGB_COMMON_H_ @@ -55,28 +57,6 @@ #define DRV_DESCRIPTION "Chelsio 10Gb Ethernet Driver" #define DRV_NAME "cxgb" #define DRV_VERSION "2.2" -#define PFX DRV_NAME ": " - -#define CH_ERR(fmt, ...) printk(KERN_ERR PFX fmt, ## __VA_ARGS__) -#define CH_WARN(fmt, ...) printk(KERN_WARNING PFX fmt, ## __VA_ARGS__) -#define CH_ALERT(fmt, ...) printk(KERN_ALERT PFX fmt, ## __VA_ARGS__) - -/* - * More powerful macro that selectively prints messages based on msg_enable. - * For info and debugging messages. - */ -#define CH_MSG(adapter, level, category, fmt, ...) do { \ - if ((adapter)->msg_enable & NETIF_MSG_##category) \ - printk(KERN_##level PFX "%s: " fmt, (adapter)->name, \ - ## __VA_ARGS__); \ -} while (0) - -#ifdef DEBUG -# define CH_DBG(adapter, category, fmt, ...) \ - CH_MSG(adapter, DEBUG, category, fmt, ## __VA_ARGS__) -#else -# define CH_DBG(fmt, ...) -#endif #define CH_DEVICE(devid, ssid, idx) \ { PCI_VENDOR_ID_CHELSIO, devid, PCI_ANY_ID, ssid, 0, 0, idx } |