diff options
| author | Joe Perches <joe@perches.com> | 2010-02-17 15:01:52 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-02-17 17:45:20 -0800 |
| commit | 7995c64e5b56ec7fe6032e5fc586f726cde2152b (patch) | |
| tree | b072d2e42f717d8f2c3d94e9431c48a3e8304f72 /drivers/net/bnx2x.h | |
| parent | 3a9c6a4915e584663aebdb9016bcb9d3897dd779 (diff) | |
| download | kernel_samsung_smdk4412-7995c64e5b56ec7fe6032e5fc586f726cde2152b.zip kernel_samsung_smdk4412-7995c64e5b56ec7fe6032e5fc586f726cde2152b.tar.gz kernel_samsung_smdk4412-7995c64e5b56ec7fe6032e5fc586f726cde2152b.tar.bz2 | |
drivers/net/bnx2x: Use (pr|netdev|netif)_<level> macro helpers
Add #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
Convert struct bnx2x member msglevel to msg_enable for netif_msg_<foo> macros
Remove #define PFX
Use pr_<level>
Use netdev_<level>
Use netif_<level>
Coalesce long formats
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/bnx2x.h')
| -rw-r--r-- | drivers/net/bnx2x.h | 49 |
1 files changed, 29 insertions, 20 deletions
diff --git a/drivers/net/bnx2x.h b/drivers/net/bnx2x.h index d997d84..3c48a7a 100644 --- a/drivers/net/bnx2x.h +++ b/drivers/net/bnx2x.h @@ -44,7 +44,6 @@ /* error/debug prints */ #define DRV_MODULE_NAME "bnx2x" -#define PFX DRV_MODULE_NAME ": " /* for messages that are currently off */ #define BNX2X_MSG_OFF 0 @@ -58,30 +57,40 @@ #define DP_LEVEL KERN_NOTICE /* was: KERN_DEBUG */ /* regular debug print */ -#define DP(__mask, __fmt, __args...) do { \ - if (bp->msglevel & (__mask)) \ - printk(DP_LEVEL "[%s:%d(%s)]" __fmt, __func__, __LINE__, \ - bp->dev ? (bp->dev->name) : "?", ##__args); \ - } while (0) +#define DP(__mask, __fmt, __args...) \ +do { \ + if (bp->msg_enable & (__mask)) \ + printk(DP_LEVEL "[%s:%d(%s)]" __fmt, \ + __func__, __LINE__, \ + bp->dev ? (bp->dev->name) : "?", \ + ##__args); \ +} while (0) /* errors debug print */ -#define BNX2X_DBG_ERR(__fmt, __args...) do { \ - if (bp->msglevel & NETIF_MSG_PROBE) \ - printk(KERN_ERR "[%s:%d(%s)]" __fmt, __func__, __LINE__, \ - bp->dev ? (bp->dev->name) : "?", ##__args); \ - } while (0) +#define BNX2X_DBG_ERR(__fmt, __args...) \ +do { \ + if (netif_msg_probe(bp)) \ + pr_err("[%s:%d(%s)]" __fmt, \ + __func__, __LINE__, \ + bp->dev ? (bp->dev->name) : "?", \ + ##__args); \ +} while (0) /* for errors (never masked) */ -#define BNX2X_ERR(__fmt, __args...) do { \ - printk(KERN_ERR "[%s:%d(%s)]" __fmt, __func__, __LINE__, \ - bp->dev ? (bp->dev->name) : "?", ##__args); \ - } while (0) +#define BNX2X_ERR(__fmt, __args...) \ +do { \ + pr_err("[%s:%d(%s)]" __fmt, \ + __func__, __LINE__, \ + bp->dev ? (bp->dev->name) : "?", \ + ##__args); \ +} while (0) /* before we have a dev->name use dev_info() */ -#define BNX2X_DEV_INFO(__fmt, __args...) do { \ - if (bp->msglevel & NETIF_MSG_PROBE) \ - dev_info(&bp->pdev->dev, __fmt, ##__args); \ - } while (0) +#define BNX2X_DEV_INFO(__fmt, __args...) \ +do { \ + if (netif_msg_probe(bp)) \ + dev_info(&bp->pdev->dev, __fmt, ##__args); \ +} while (0) #ifdef BNX2X_STOP_ON_ERROR @@ -882,7 +891,7 @@ struct bnx2x { /* End of fields used in the performance code paths */ int panic; - int msglevel; + int msg_enable; u32 flags; #define PCIX_FLAG 1 |