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>

diff --git a/drivers/net/e1000e/e1000.h b/drivers/net/e1000e/e1000.h
index 8da190b930a2fd5779004b4a6216a7e149e36253..11e02e1f187ca5bed2836b3ba48183029c0481ec 100644 (file)
--- a/drivers/net/e1000e/e1000.h
+++ b/drivers/net/e1000e/e1000.h
@@ -42,25 +42,16 @@
 
 struct e1000_info;
 
-#define e_printk(level, adapter, format, arg...) \
-       printk(level "%s: %s: " format, pci_name(adapter->pdev), \
-              adapter->netdev->name, ## arg)
-
-#ifdef DEBUG
 #define e_dbg(format, arg...) \
-       e_printk(KERN_DEBUG , hw->adapter, format, ## arg)
-#else
-#define e_dbg(format, arg...) do { (void)(hw); } while (0)
-#endif
-
+       netdev_dbg(hw->adapter->netdev, format, ## arg)
 #define e_err(format, arg...) \
-       e_printk(KERN_ERR, adapter, format, ## arg)
+       netdev_err(adapter->netdev, format, ## arg)
 #define e_info(format, arg...) \
-       e_printk(KERN_INFO, adapter, format, ## arg)
+       netdev_info(adapter->netdev, format, ## arg)
 #define e_warn(format, arg...) \
-       e_printk(KERN_WARNING, adapter, format, ## arg)
+       netdev_warn(adapter->netdev, format, ## arg)
 #define e_notice(format, arg...) \
-       e_printk(KERN_NOTICE, adapter, format, ## arg)
+       netdev_notice(adapter->netdev, format, ## arg)
 
 
 /* Interrupt modes, as used by the IntMode parameter */

diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c
index 06ba46ae2983dcc216709f4c7f73636ad3c3e8d9..5304959ae1f77434f8a76edef7f481e54e81c2e4 100644 (file)
--- a/drivers/net/e1000e/netdev.c
+++ b/drivers/net/e1000e/netdev.c
@@ -26,6 +26,8 @@
 
 *******************************************************************************/
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/module.h>
 #include <linux/types.h>
 #include <linux/init.h>
@@ -5509,10 +5511,9 @@ static struct pci_driver e1000_driver = {
 static int __init e1000_init_module(void)
 {
        int ret;
-       printk(KERN_INFO "%s: Intel(R) PRO/1000 Network Driver - %s\n",
-              e1000e_driver_name, e1000e_driver_version);
-       printk(KERN_INFO "%s: Copyright (c) 1999 - 2009 Intel Corporation.\n",
-              e1000e_driver_name);
+       pr_info("Intel(R) PRO/1000 Network Driver - %s\n",
+               e1000e_driver_version);
+       pr_info("Copyright (c) 1999 - 2009 Intel Corporation.\n");
        ret = pci_register_driver(&e1000_driver);
 
        return ret;