diff options
| author | Emil Tantilov <emil.s.tantilov@intel.com> | 2010-04-27 14:02:58 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-27 17:05:03 -0700 |
| commit | 675ad47375c76a7c3be4ace9554d92cd55518ced (patch) | |
| tree | 54acb7e8aa4db5e93b960d565b1cc2dce45988b9 /drivers/net/e1000/e1000_osdep.h | |
| parent | 709b9326ef6fc1b7e379d47d5f39ebc27dad3f4d (diff) | |
| download | blackbird-op-linux-675ad47375c76a7c3be4ace9554d92cd55518ced.tar.gz blackbird-op-linux-675ad47375c76a7c3be4ace9554d92cd55518ced.zip | |
e1000: Use netdev_<level>, pr_<level> and dev_<level>
This patch is an alternative to similar patch provided by Joe Perches.
Substitute DPRINTK macro for e_<level> that uses netdev_<level> and dev_<level>
similar to e1000e.
- Convert printk to pr_<level> where applicable.
- Use common #define pr_fmt for the driver.
- Use dev_<level> for displaying text in parts of the driver where the interface
name is not assigned (like e1000_param.c).
- Better align test with the new macros.
CC: Joe Perches <joe@perches.com>
Signed-off-by: Emil Tantilov <emil.s.tantilov@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/e1000/e1000_osdep.h')
| -rw-r--r-- | drivers/net/e1000/e1000_osdep.h | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/drivers/net/e1000/e1000_osdep.h b/drivers/net/e1000/e1000_osdep.h index d9298522f5ae..edd1c75aa895 100644 --- a/drivers/net/e1000/e1000_osdep.h +++ b/drivers/net/e1000/e1000_osdep.h @@ -41,20 +41,6 @@ #include <linux/interrupt.h> #include <linux/sched.h> -#ifdef DBG -#define DEBUGOUT(S) printk(KERN_DEBUG S "\n") -#define DEBUGOUT1(S, A...) printk(KERN_DEBUG S "\n", A) -#else -#define DEBUGOUT(S) -#define DEBUGOUT1(S, A...) -#endif - -#define DEBUGFUNC(F) DEBUGOUT(F "\n") -#define DEBUGOUT2 DEBUGOUT1 -#define DEBUGOUT3 DEBUGOUT2 -#define DEBUGOUT7 DEBUGOUT3 - - #define er32(reg) \ (readl(hw->hw_addr + ((hw->mac_type >= e1000_82543) \ ? E1000_##reg : E1000_82542_##reg))) |
