1 files changed, 5 insertions, 15 deletions

diff --git a/drivers/net/e1000e/e1000.h b/drivers/net/e1000e/e1000.h
index 8da190b930a2..12648a1cdb78 100644
--- 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 */
@@ -282,7 +273,6 @@ struct e1000_adapter {
 
         struct napi_struct napi;
 
-        unsigned long tx_queue_len;
         unsigned int restart_queue;
         u32 txd_cmd;