diff options
| author | Joe Perches <joe@perches.com> | 2010-02-15 08:34:22 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-02-16 15:45:43 -0800 |
| commit | 865a21a5e3d1b384c559a44c898fcad93e187b82 (patch) | |
| tree | 7ade861f21f42ea0bc36747f6acd02cd08f63b1a /drivers/net/tehuti.h | |
| parent | 6c35abaedc191e2c7c8fa40a2b4c2b01d553b768 (diff) | |
drivers/net/tehuti.c: Use (pr|netdev|netif)_<levels> macro helpers
Make the output logging messages a bit more consistent.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/tehuti.h')
| -rw-r--r-- | drivers/net/tehuti.h | 30 |
1 files changed, 18 insertions, 12 deletions
diff --git a/drivers/net/tehuti.h b/drivers/net/tehuti.h index 124141909e4..a19dcf8b6b5 100644 --- a/drivers/net/tehuti.h +++ b/drivers/net/tehuti.h @@ -529,28 +529,34 @@ struct txd_desc { /* Debugging Macros */ -#define ERR(fmt, args...) printk(KERN_ERR fmt, ## args) -#define DBG2(fmt, args...) \ - printk(KERN_ERR "%s:%-5d: " fmt, __func__, __LINE__, ## args) +#define DBG2(fmt, args...) \ + pr_err("%s:%-5d: " fmt, __func__, __LINE__, ## args) #define BDX_ASSERT(x) BUG_ON(x) #ifdef DEBUG -#define ENTER do { \ - printk(KERN_ERR "%s:%-5d: ENTER\n", __func__, __LINE__); \ +#define ENTER \ +do { \ + pr_err("%s:%-5d: ENTER\n", __func__, __LINE__); \ } while (0) -#define RET(args...) do { \ - printk(KERN_ERR "%s:%-5d: RETURN\n", __func__, __LINE__); \ -return args; } while (0) +#define RET(args...) \ +do { \ + pr_err("%s:%-5d: RETURN\n", __func__, __LINE__); \ + return args; \ +} while (0) -#define DBG(fmt, args...) \ - printk(KERN_ERR "%s:%-5d: " fmt, __func__, __LINE__, ## args) +#define DBG(fmt, args...) \ + pr_err("%s:%-5d: " fmt, __func__, __LINE__, ## args) #else -#define ENTER do { } while (0) +#define ENTER do { } while (0) #define RET(args...) return args -#define DBG(fmt, args...) do { } while (0) +#define DBG(fmt, args...) \ +do { \ + if (0) \ + pr_err(fmt, ##args); \ +} while (0) #endif #endif /* _BDX__H */ |