diff options
author | Bruce Allan <bruce.w.allan@intel.com> | 2010-03-24 08:55:30 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-03-27 00:05:23 -0400 |
commit | 8544b9f7371ec6a7a5c0f8701ddde9e98f52a37e (patch) | |
tree | 36c2e615c3cb879602600f3a3e0f6beb37fdb15a /drivers/net/e1000e/netdev.c | |
parent | 66aa4a55fe0548c8b13a195c61774db65c5896cd (diff) |
e1000e: Use pr_<level> and netdev_<level>
As an alternative to a quite large patch previously submitted by Joe
Perches to make use of kernel logging API, this patch is much less
intrusive.
Convert e_<level> to netdev_<level>
Use #define pr_fmt
Convert a few printks to pr_<level>
Cc: Joe Perches <joe@perches.com>
Signed-off-by: Bruce Allan <bruce.w.allan@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/e1000e/netdev.c')
-rw-r--r-- | drivers/net/e1000e/netdev.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c index 06ba46ae2983..5304959ae1f7 100644 --- a/drivers/net/e1000e/netdev.c +++ b/drivers/net/e1000e/netdev.c | |||
@@ -26,6 +26,8 @@ | |||
26 | 26 | ||
27 | *******************************************************************************/ | 27 | *******************************************************************************/ |
28 | 28 | ||
29 | #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt | ||
30 | |||
29 | #include <linux/module.h> | 31 | #include <linux/module.h> |
30 | #include <linux/types.h> | 32 | #include <linux/types.h> |
31 | #include <linux/init.h> | 33 | #include <linux/init.h> |
@@ -5509,10 +5511,9 @@ static struct pci_driver e1000_driver = { | |||
5509 | static int __init e1000_init_module(void) | 5511 | static int __init e1000_init_module(void) |
5510 | { | 5512 | { |
5511 | int ret; | 5513 | int ret; |
5512 | printk(KERN_INFO "%s: Intel(R) PRO/1000 Network Driver - %s\n", | 5514 | pr_info("Intel(R) PRO/1000 Network Driver - %s\n", |
5513 | e1000e_driver_name, e1000e_driver_version); | 5515 | e1000e_driver_version); |
5514 | printk(KERN_INFO "%s: Copyright (c) 1999 - 2009 Intel Corporation.\n", | 5516 | pr_info("Copyright (c) 1999 - 2009 Intel Corporation.\n"); |
5515 | e1000e_driver_name); | ||
5516 | ret = pci_register_driver(&e1000_driver); | 5517 | ret = pci_register_driver(&e1000_driver); |
5517 | 5518 | ||
5518 | return ret; | 5519 | return ret; |