e1000e: consolidate two dbug macros into one simpler one

This patch depends on a previous one that cleans up redundant #includes.

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>

8 files changed, 183 insertions, 206 deletions

diff --git a/drivers/net/e1000e/82571.c b/drivers/net/e1000e/82571.c
index 407637f6c331..680b7c703062 100644
--- a/drivers/net/e1000e/82571.c
+++ b/drivers/net/e1000e/82571.c
@@ -309,7 +309,7 @@ static s32 e1000_init_mac_params_82571(struct e1000_adapter *adapter)
                          * indicates that the bootagent or EFI code has
                          * improperly left this bit enabled
                          */
-                        hw_dbg(hw, "Please update your 82571 Bootagent\n");
+                        e_dbg("Please update your 82571 Bootagent\n");
                 }
                 ew32(SWSM, swsm & ~E1000_SWSM_SMBI);
         }
@@ -483,7 +483,7 @@ static s32 e1000_get_hw_semaphore_82571(struct e1000_hw *hw)
         }
 
         if (i == sw_timeout) {
-                hw_dbg(hw, "Driver can't access device - SMBI bit is set.\n");
+                e_dbg("Driver can't access device - SMBI bit is set.\n");
                 hw->dev_spec.e82571.smb_counter++;
         }
         /* Get the FW semaphore. */
@@ -501,7 +501,7 @@ static s32 e1000_get_hw_semaphore_82571(struct e1000_hw *hw)
         if (i == fw_timeout) {
                 /* Release semaphores */
                 e1000_put_hw_semaphore_82571(hw);
-                hw_dbg(hw, "Driver can't access the NVM\n");
+                e_dbg("Driver can't access the NVM\n");
                 return -E1000_ERR_NVM;
         }
 
@@ -708,7 +708,7 @@ static s32 e1000_write_nvm_eewr_82571(struct e1000_hw *hw, u16 offset,
          */
         if ((offset >= nvm->word_size) || (words > (nvm->word_size - offset)) ||
             (words == 0)) {
-                hw_dbg(hw, "nvm parameter(s) out of bounds\n");
+                e_dbg("nvm parameter(s) out of bounds\n");
                 return -E1000_ERR_NVM;
         }
 
@@ -749,7 +749,7 @@ static s32 e1000_get_cfg_done_82571(struct e1000_hw *hw)
                 timeout--;
         }
         if (!timeout) {
-                hw_dbg(hw, "MNG configuration cycle has not completed.\n");
+                e_dbg("MNG configuration cycle has not completed.\n");
                 return -E1000_ERR_RESET;
         }
 
@@ -848,9 +848,9 @@ static s32 e1000_reset_hw_82571(struct e1000_hw *hw)
          */
         ret_val = e1000e_disable_pcie_master(hw);
         if (ret_val)
-                hw_dbg(hw, "PCI-E Master disable polling has failed.\n");
+                e_dbg("PCI-E Master disable polling has failed.\n");
 
-        hw_dbg(hw, "Masking off all interrupts\n");
+        e_dbg("Masking off all interrupts\n");
         ew32(IMC, 0xffffffff);
 
         ew32(RCTL, 0);
@@ -889,7 +889,7 @@ static s32 e1000_reset_hw_82571(struct e1000_hw *hw)
 
         ctrl = er32(CTRL);
 
-        hw_dbg(hw, "Issuing a global reset to MAC\n");
+        e_dbg("Issuing a global reset to MAC\n");
         ew32(CTRL, ctrl | E1000_CTRL_RST);
 
         if (hw->nvm.type == e1000_nvm_flash_hw) {
@@ -955,12 +955,12 @@ static s32 e1000_init_hw_82571(struct e1000_hw *hw)
         /* Initialize identification LED */
         ret_val = e1000e_id_led_init(hw);
         if (ret_val) {
-                hw_dbg(hw, "Error initializing identification LED\n");
+                e_dbg("Error initializing identification LED\n");
                 return ret_val;
         }
 
         /* Disabling VLAN filtering */
-        hw_dbg(hw, "Initializing the IEEE VLAN\n");
+        e_dbg("Initializing the IEEE VLAN\n");
         e1000e_clear_vfta(hw);
 
         /* Setup the receive address. */
@@ -974,7 +974,7 @@ static s32 e1000_init_hw_82571(struct e1000_hw *hw)
         e1000e_init_rx_addrs(hw, rar_count);
 
         /* Zero out the Multicast HASH table */
-        hw_dbg(hw, "Zeroing the MTA\n");
+        e_dbg("Zeroing the MTA\n");
         for (i = 0; i < mac->mta_reg_count; i++)
                 E1000_WRITE_REG_ARRAY(hw, E1000_MTA, i, 0);
 
@@ -1383,7 +1383,7 @@ static s32 e1000_check_for_serdes_link_82571(struct e1000_hw *hw)
                                  */
                                 mac->serdes_link_state =
                                     e1000_serdes_link_autoneg_progress;
-                                hw_dbg(hw, "AN_UP     -> AN_PROG\n");
+                                e_dbg("AN_UP     -> AN_PROG\n");
                         }
                 break;
 
@@ -1401,7 +1401,7 @@ static s32 e1000_check_for_serdes_link_82571(struct e1000_hw *hw)
                                     (ctrl & ~E1000_CTRL_SLU));
                                 mac->serdes_link_state =
                                     e1000_serdes_link_autoneg_progress;
-                                hw_dbg(hw, "FORCED_UP -> AN_PROG\n");
+                                e_dbg("FORCED_UP -> AN_PROG\n");
                         }
                         break;
 
@@ -1415,7 +1415,7 @@ static s32 e1000_check_for_serdes_link_82571(struct e1000_hw *hw)
                         if (status & E1000_STATUS_LU)  {
                                 mac->serdes_link_state =
                                     e1000_serdes_link_autoneg_complete;
-                                hw_dbg(hw, "AN_PROG   -> AN_UP\n");
+                                e_dbg("AN_PROG   -> AN_UP\n");
                         } else {
                                 /*
                                  * Disable autoneg, force link up and
@@ -1430,12 +1430,12 @@ static s32 e1000_check_for_serdes_link_82571(struct e1000_hw *hw)
                                 ret_val =
                                     e1000e_config_fc_after_link_up(hw);
                                 if (ret_val) {
-                                        hw_dbg(hw, "Error config flow control\n");
+                                        e_dbg("Error config flow control\n");
                                         break;
                                 }
                                 mac->serdes_link_state =
                                     e1000_serdes_link_forced_up;
-                                hw_dbg(hw, "AN_PROG   -> FORCED_UP\n");
+                                e_dbg("AN_PROG   -> FORCED_UP\n");
                         }
                         mac->serdes_has_link = true;
                         break;
@@ -1450,14 +1450,14 @@ static s32 e1000_check_for_serdes_link_82571(struct e1000_hw *hw)
                             (ctrl & ~E1000_CTRL_SLU));
                         mac->serdes_link_state =
                             e1000_serdes_link_autoneg_progress;
-                        hw_dbg(hw, "DOWN      -> AN_PROG\n");
+                        e_dbg("DOWN      -> AN_PROG\n");
                         break;
                 }
         } else {
                 if (!(rxcw & E1000_RXCW_SYNCH)) {
                         mac->serdes_has_link = false;
                         mac->serdes_link_state = e1000_serdes_link_down;
-                        hw_dbg(hw, "ANYSTATE  -> DOWN\n");
+                        e_dbg("ANYSTATE  -> DOWN\n");
                 } else {
                         /*
                          * We have sync, and can tolerate one
@@ -1469,7 +1469,7 @@ static s32 e1000_check_for_serdes_link_82571(struct e1000_hw *hw)
                         if (rxcw & E1000_RXCW_IV) {
                                 mac->serdes_link_state = e1000_serdes_link_down;
                                 mac->serdes_has_link = false;
-                                hw_dbg(hw, "ANYSTATE  -> DOWN\n");
+                                e_dbg("ANYSTATE  -> DOWN\n");
                         }
                 }
         }
@@ -1491,7 +1491,7 @@ static s32 e1000_valid_led_default_82571(struct e1000_hw *hw, u16 *data)
 
         ret_val = e1000_read_nvm(hw, NVM_ID_LED_SETTINGS, 1, data);
         if (ret_val) {
-                hw_dbg(hw, "NVM Read Error\n");
+                e_dbg("NVM Read Error\n");
                 return ret_val;
         }
 
diff --git a/drivers/net/e1000e/e1000.h b/drivers/net/e1000e/e1000.h
index ac5d8552747b..dac00a023835 100644
--- a/drivers/net/e1000e/e1000.h
+++ b/drivers/net/e1000e/e1000.h
@@ -48,9 +48,9 @@ struct e1000_info;
 
 #ifdef DEBUG
 #define e_dbg(format, arg...) \
-        e_printk(KERN_DEBUG , adapter, format, ## arg)
+        e_printk(KERN_DEBUG , hw->adapter, format, ## arg)
 #else
-#define e_dbg(format, arg...) do { (void)(adapter); } while (0)
+#define e_dbg(format, arg...) do { (void)(hw); } while (0)
 #endif
 
 #define e_err(format, arg...) \
diff --git a/drivers/net/e1000e/es2lan.c b/drivers/net/e1000e/es2lan.c
index 6fd46f5f8a3c..f5601c5ff7af 100644
--- a/drivers/net/e1000e/es2lan.c
+++ b/drivers/net/e1000e/es2lan.c
@@ -394,8 +394,7 @@ static s32 e1000_acquire_swfw_sync_80003es2lan(struct e1000_hw *hw, u16 mask)
         }
 
         if (i == timeout) {
-                hw_dbg(hw,
-                       "Driver can't access resource, SW_FW_SYNC timeout.\n");
+                e_dbg("Driver can't access resource, SW_FW_SYNC timeout.\n");
                 return -E1000_ERR_SWFW_SYNC;
         }
 
@@ -597,7 +596,7 @@ static s32 e1000_get_cfg_done_80003es2lan(struct e1000_hw *hw)
                 timeout--;
         }
         if (!timeout) {
-                hw_dbg(hw, "MNG configuration cycle has not completed.\n");
+                e_dbg("MNG configuration cycle has not completed.\n");
                 return -E1000_ERR_RESET;
         }
 
@@ -630,7 +629,7 @@ static s32 e1000_phy_force_speed_duplex_80003es2lan(struct e1000_hw *hw)
         if (ret_val)
                 return ret_val;
 
-        hw_dbg(hw, "GG82563 PSCR: %X\n", phy_data);
+        e_dbg("GG82563 PSCR: %X\n", phy_data);
 
         ret_val = e1e_rphy(hw, PHY_CONTROL, &phy_data);
         if (ret_val)
@@ -648,7 +647,7 @@ static s32 e1000_phy_force_speed_duplex_80003es2lan(struct e1000_hw *hw)
         udelay(1);
 
         if (hw->phy.autoneg_wait_to_complete) {
-                hw_dbg(hw, "Waiting for forced speed/duplex link "
+                e_dbg("Waiting for forced speed/duplex link "
                          "on GG82563 phy.\n");
 
                 ret_val = e1000e_phy_has_link_generic(hw, PHY_FORCE_LIMIT,
@@ -771,9 +770,9 @@ static s32 e1000_reset_hw_80003es2lan(struct e1000_hw *hw)
          */
         ret_val = e1000e_disable_pcie_master(hw);
         if (ret_val)
-                hw_dbg(hw, "PCI-E Master disable polling has failed.\n");
+                e_dbg("PCI-E Master disable polling has failed.\n");
 
-        hw_dbg(hw, "Masking off all interrupts\n");
+        e_dbg("Masking off all interrupts\n");
         ew32(IMC, 0xffffffff);
 
         ew32(RCTL, 0);
@@ -785,7 +784,7 @@ static s32 e1000_reset_hw_80003es2lan(struct e1000_hw *hw)
         ctrl = er32(CTRL);
 
         ret_val = e1000_acquire_phy_80003es2lan(hw);
-        hw_dbg(hw, "Issuing a global reset to MAC\n");
+        e_dbg("Issuing a global reset to MAC\n");
         ew32(CTRL, ctrl | E1000_CTRL_RST);
         e1000_release_phy_80003es2lan(hw);
 
@@ -820,19 +819,19 @@ static s32 e1000_init_hw_80003es2lan(struct e1000_hw *hw)
         /* Initialize identification LED */
         ret_val = e1000e_id_led_init(hw);
         if (ret_val) {
-                hw_dbg(hw, "Error initializing identification LED\n");
+                e_dbg("Error initializing identification LED\n");
                 return ret_val;
         }
 
         /* Disabling VLAN filtering */
-        hw_dbg(hw, "Initializing the IEEE VLAN\n");
+        e_dbg("Initializing the IEEE VLAN\n");
         e1000e_clear_vfta(hw);
 
         /* Setup the receive address. */
         e1000e_init_rx_addrs(hw, mac->rar_entry_count);
 
         /* Zero out the Multicast HASH table */
-        hw_dbg(hw, "Zeroing the MTA\n");
+        e_dbg("Zeroing the MTA\n");
         for (i = 0; i < mac->mta_reg_count; i++)
                 E1000_WRITE_REG_ARRAY(hw, E1000_MTA, i, 0);
 
@@ -989,7 +988,7 @@ static s32 e1000_copper_link_setup_gg82563_80003es2lan(struct e1000_hw *hw)
         /* SW Reset the PHY so all changes take effect */
         ret_val = e1000e_commit_phy(hw);
         if (ret_val) {
-                hw_dbg(hw, "Error Resetting the PHY\n");
+                e_dbg("Error Resetting the PHY\n");
                 return ret_val;
         }
 
diff --git a/drivers/net/e1000e/hw.h b/drivers/net/e1000e/hw.h
index aaea41ef794d..44808b053fcc 100644
--- a/drivers/net/e1000e/hw.h
+++ b/drivers/net/e1000e/hw.h
@@ -925,15 +925,4 @@ struct e1000_hw {
         } dev_spec;
 };
 
-#ifdef DEBUG
-#define hw_dbg(hw, format, arg...) \
-        printk(KERN_DEBUG "%s: " format, e1000e_get_hw_dev_name(hw), ##arg)
-#else
-static inline int __attribute__ ((format (printf, 2, 3)))
-hw_dbg(struct e1000_hw *hw, const char *format, ...)
-{
-        return 0;
-}
-#endif
-
 #endif
diff --git a/drivers/net/e1000e/ich8lan.c b/drivers/net/e1000e/ich8lan.c
index bef5e3333f2a..101a2714467e 100644
--- a/drivers/net/e1000e/ich8lan.c
+++ b/drivers/net/e1000e/ich8lan.c
@@ -368,7 +368,7 @@ static s32 e1000_init_nvm_params_ich8lan(struct e1000_hw *hw)
 
         /* Can't read flash registers if the register set isn't mapped. */
         if (!hw->flash_address) {
-                hw_dbg(hw, "ERROR: Flash registers not mapped\n");
+                e_dbg("ERROR: Flash registers not mapped\n");
                 return -E1000_ERR_CONFIG;
         }
 
@@ -550,7 +550,7 @@ static s32 e1000_check_for_copper_link_ich8lan(struct e1000_hw *hw)
          */
         ret_val = e1000e_config_fc_after_link_up(hw);
         if (ret_val)
-                hw_dbg(hw, "Error configuring flow control\n");
+                e_dbg("Error configuring flow control\n");
 
 out:
         return ret_val;
@@ -644,7 +644,7 @@ static s32 e1000_acquire_swflag_ich8lan(struct e1000_hw *hw)
         }
 
         if (!timeout) {
-                hw_dbg(hw, "SW/FW/HW has locked the resource for too long.\n");
+                e_dbg("SW/FW/HW has locked the resource for too long.\n");
                 ret_val = -E1000_ERR_CONFIG;
                 goto out;
         }
@@ -664,7 +664,7 @@ static s32 e1000_acquire_swflag_ich8lan(struct e1000_hw *hw)
         }
 
         if (!timeout) {
-                hw_dbg(hw, "Failed to acquire the semaphore.\n");
+                e_dbg("Failed to acquire the semaphore.\n");
                 extcnf_ctrl &= ~E1000_EXTCNF_CTRL_SWFLAG;
                 ew32(EXTCNF_CTRL, extcnf_ctrl);
                 ret_val = -E1000_ERR_CONFIG;
@@ -773,12 +773,12 @@ static s32 e1000_phy_force_speed_duplex_ich8lan(struct e1000_hw *hw)
         if (ret_val)
                 return ret_val;
 
-        hw_dbg(hw, "IFE PMC: %X\n", data);
+        e_dbg("IFE PMC: %X\n", data);
 
         udelay(1);
 
         if (phy->autoneg_wait_to_complete) {
-                hw_dbg(hw, "Waiting for forced speed/duplex link on IFE phy.\n");
+                e_dbg("Waiting for forced speed/duplex link on IFE phy.\n");
 
                 ret_val = e1000e_phy_has_link_generic(hw,
                                                      PHY_FORCE_LIMIT,
@@ -788,7 +788,7 @@ static s32 e1000_phy_force_speed_duplex_ich8lan(struct e1000_hw *hw)
                         return ret_val;
 
                 if (!link)
-                        hw_dbg(hw, "Link taking longer than expected.\n");
+                        e_dbg("Link taking longer than expected.\n");
 
                 /* Try once more */
                 ret_val = e1000e_phy_has_link_generic(hw,
@@ -1203,7 +1203,7 @@ static void e1000_lan_init_done_ich8lan(struct e1000_hw *hw)
          * leave the PHY in a bad state possibly resulting in no link.
          */
         if (loop == 0)
-                hw_dbg(hw, "LAN_INIT_DONE not set, increase timeout\n");
+                e_dbg("LAN_INIT_DONE not set, increase timeout\n");
 
         /* Clear the Init Done bit for the next init event */
         data = er32(STATUS);
@@ -1274,7 +1274,7 @@ static s32 e1000_get_phy_info_ife_ich8lan(struct e1000_hw *hw)
                 return ret_val;
 
         if (!link) {
-                hw_dbg(hw, "Phy info is only valid if link is up\n");
+                e_dbg("Phy info is only valid if link is up\n");
                 return -E1000_ERR_CONFIG;
         }
 
@@ -1604,7 +1604,7 @@ static s32 e1000_valid_nvm_bank_detect_ich8lan(struct e1000_hw *hw, u32 *bank)
 
                         return 0;
                 }
-                hw_dbg(hw, "Unable to determine valid NVM bank via EEC - "
+                e_dbg("Unable to determine valid NVM bank via EEC - "
                        "reading flash signature\n");
                 /* fall-thru */
         default:
@@ -1634,7 +1634,7 @@ static s32 e1000_valid_nvm_bank_detect_ich8lan(struct e1000_hw *hw, u32 *bank)
                         return 0;
                 }
 
-                hw_dbg(hw, "ERROR: No valid NVM bank present\n");
+                e_dbg("ERROR: No valid NVM bank present\n");
                 return -E1000_ERR_NVM;
         }
 
@@ -1662,7 +1662,7 @@ static s32 e1000_read_nvm_ich8lan(struct e1000_hw *hw, u16 offset, u16 words,
 
         if ((offset >= nvm->word_size) || (words > nvm->word_size - offset) ||
             (words == 0)) {
-                hw_dbg(hw, "nvm parameter(s) out of bounds\n");
+                e_dbg("nvm parameter(s) out of bounds\n");
                 ret_val = -E1000_ERR_NVM;
                 goto out;
         }
@@ -1671,7 +1671,7 @@ static s32 e1000_read_nvm_ich8lan(struct e1000_hw *hw, u16 offset, u16 words,
 
         ret_val = e1000_valid_nvm_bank_detect_ich8lan(hw, &bank);
         if (ret_val) {
-                hw_dbg(hw, "Could not detect valid bank, assuming bank 0\n");
+                e_dbg("Could not detect valid bank, assuming bank 0\n");
                 bank = 0;
         }
 
@@ -1697,7 +1697,7 @@ static s32 e1000_read_nvm_ich8lan(struct e1000_hw *hw, u16 offset, u16 words,
 
 out:
         if (ret_val)
-                hw_dbg(hw, "NVM read error: %d\n", ret_val);
+                e_dbg("NVM read error: %d\n", ret_val);
 
         return ret_val;
 }
@@ -1719,7 +1719,7 @@ static s32 e1000_flash_cycle_init_ich8lan(struct e1000_hw *hw)
 
         /* Check if the flash descriptor is valid */
         if (hsfsts.hsf_status.fldesvalid == 0) {
-                hw_dbg(hw, "Flash descriptor invalid.  "
+                e_dbg("Flash descriptor invalid.  "
                          "SW Sequencing must be used.");
                 return -E1000_ERR_NVM;
         }
@@ -1769,7 +1769,7 @@ static s32 e1000_flash_cycle_init_ich8lan(struct e1000_hw *hw)
                         hsfsts.hsf_status.flcdone = 1;
                         ew16flash(ICH_FLASH_HSFSTS, hsfsts.regval);
                 } else {
-                        hw_dbg(hw, "Flash controller busy, cannot get access");
+                        e_dbg("Flash controller busy, cannot get access");
                 }
         }
 
@@ -1919,7 +1919,7 @@ static s32 e1000_read_flash_data_ich8lan(struct e1000_hw *hw, u32 offset,
                                 /* Repeat for some time before giving up. */
                                 continue;
                         } else if (hsfsts.hsf_status.flcdone == 0) {
-                                hw_dbg(hw, "Timeout error - flash cycle "
+                                e_dbg("Timeout error - flash cycle "
                                          "did not complete.");
                                 break;
                         }
@@ -1947,7 +1947,7 @@ static s32 e1000_write_nvm_ich8lan(struct e1000_hw *hw, u16 offset, u16 words,
 
         if ((offset >= nvm->word_size) || (words > nvm->word_size - offset) ||
             (words == 0)) {
-                hw_dbg(hw, "nvm parameter(s) out of bounds\n");
+                e_dbg("nvm parameter(s) out of bounds\n");
                 return -E1000_ERR_NVM;
         }
 
@@ -1998,7 +1998,7 @@ static s32 e1000_update_nvm_checksum_ich8lan(struct e1000_hw *hw)
          */
         ret_val =  e1000_valid_nvm_bank_detect_ich8lan(hw, &bank);
         if (ret_val) {
-                hw_dbg(hw, "Could not detect valid bank, assuming bank 0\n");
+                e_dbg("Could not detect valid bank, assuming bank 0\n");
                 bank = 0;
         }
 
@@ -2072,7 +2072,7 @@ static s32 e1000_update_nvm_checksum_ich8lan(struct e1000_hw *hw)
          */
         if (ret_val) {
                 /* Possibly read-only, see e1000e_write_protect_nvm_ich8lan() */
-                hw_dbg(hw, "Flash commit failed.\n");
+                e_dbg("Flash commit failed.\n");
                 nvm->ops.release_nvm(hw);
                 goto out;
         }
@@ -2128,7 +2128,7 @@ static s32 e1000_update_nvm_checksum_ich8lan(struct e1000_hw *hw)
 
 out:
         if (ret_val)
-                hw_dbg(hw, "NVM update error: %d\n", ret_val);
+                e_dbg("NVM update error: %d\n", ret_val);
 
         return ret_val;
 }
@@ -2278,7 +2278,7 @@ static s32 e1000_write_flash_data_ich8lan(struct e1000_hw *hw, u32 offset,
                         /* Repeat for some time before giving up. */
                         continue;
                 if (hsfsts.hsf_status.flcdone == 0) {
-                        hw_dbg(hw, "Timeout error - flash cycle "
+                        e_dbg("Timeout error - flash cycle "
                                  "did not complete.");
                         break;
                 }
@@ -2323,7 +2323,7 @@ static s32 e1000_retry_write_flash_byte_ich8lan(struct e1000_hw *hw,
                 return ret_val;
 
         for (program_retries = 0; program_retries < 100; program_retries++) {
-                hw_dbg(hw, "Retrying Byte %2.2X at offset %u\n", byte, offset);
+                e_dbg("Retrying Byte %2.2X at offset %u\n", byte, offset);
                 udelay(100);
                 ret_val = e1000_write_flash_byte_ich8lan(hw, offset, byte);
                 if (!ret_val)
@@ -2458,7 +2458,7 @@ static s32 e1000_valid_led_default_ich8lan(struct e1000_hw *hw, u16 *data)
 
         ret_val = e1000_read_nvm(hw, NVM_ID_LED_SETTINGS, 1, data);
         if (ret_val) {
-                hw_dbg(hw, "NVM Read Error\n");
+                e_dbg("NVM Read Error\n");
                 return ret_val;
         }
 
@@ -2588,10 +2588,10 @@ static s32 e1000_reset_hw_ich8lan(struct e1000_hw *hw)
          */
         ret_val = e1000e_disable_pcie_master(hw);
         if (ret_val) {
-                hw_dbg(hw, "PCI-E Master disable polling has failed.\n");
+                e_dbg("PCI-E Master disable polling has failed.\n");
         }
 
-        hw_dbg(hw, "Masking off all interrupts\n");
+        e_dbg("Masking off all interrupts\n");
         ew32(IMC, 0xffffffff);
 
         /*
@@ -2643,7 +2643,7 @@ static s32 e1000_reset_hw_ich8lan(struct e1000_hw *hw)
         }
         ret_val = e1000_acquire_swflag_ich8lan(hw);
         /* Whether or not the swflag was acquired, we need to reset the part */
-        hw_dbg(hw, "Issuing a global reset to ich8lan\n");
+        e_dbg("Issuing a global reset to ich8lan\n");
         ew32(CTRL, (ctrl | E1000_CTRL_RST));
         msleep(20);
 
@@ -2663,7 +2663,7 @@ static s32 e1000_reset_hw_ich8lan(struct e1000_hw *hw)
                          * return with an error. This can happen in situations
                          * where there is no eeprom and prevents getting link.
                          */
-                        hw_dbg(hw, "Auto Read Done did not complete\n");
+                        e_dbg("Auto Read Done did not complete\n");
                 }
         }
         /* Dummy read to clear the phy wakeup bit after lcd reset */
@@ -2725,7 +2725,7 @@ static s32 e1000_init_hw_ich8lan(struct e1000_hw *hw)
         /* Initialize identification LED */
         ret_val = mac->ops.id_led_init(hw);
         if (ret_val) {
-                hw_dbg(hw, "Error initializing identification LED\n");
+                e_dbg("Error initializing identification LED\n");
                 return ret_val;
         }
 
@@ -2733,7 +2733,7 @@ static s32 e1000_init_hw_ich8lan(struct e1000_hw *hw)
         e1000e_init_rx_addrs(hw, mac->rar_entry_count);
 
         /* Zero out the Multicast HASH table */
-        hw_dbg(hw, "Zeroing the MTA\n");
+        e_dbg("Zeroing the MTA\n");
         for (i = 0; i < mac->mta_reg_count; i++)
                 E1000_WRITE_REG_ARRAY(hw, E1000_MTA, i, 0);
 
@@ -2879,7 +2879,7 @@ static s32 e1000_setup_link_ich8lan(struct e1000_hw *hw)
          */
         hw->fc.current_mode = hw->fc.requested_mode;
 
-        hw_dbg(hw, "After fix-ups FlowControl is now = %x\n",
+        e_dbg("After fix-ups FlowControl is now = %x\n",
                 hw->fc.current_mode);
 
         /* Continue to configure the copper link. */
@@ -3094,7 +3094,7 @@ void e1000e_set_kmrn_lock_loss_workaround_ich8lan(struct e1000_hw *hw,
         struct e1000_dev_spec_ich8lan *dev_spec = &hw->dev_spec.ich8lan;
 
         if (hw->mac.type != e1000_ich8lan) {
-                hw_dbg(hw, "Workaround applies to ICH8 only.\n");
+                e_dbg("Workaround applies to ICH8 only.\n");
                 return;
         }
 
@@ -3372,8 +3372,7 @@ static s32 e1000_get_cfg_done_ich8lan(struct e1000_hw *hw)
                 if (status & E1000_STATUS_PHYRA)
                         ew32(STATUS, status & ~E1000_STATUS_PHYRA);
                 else
-                        hw_dbg(hw,
-                               "PHY Reset Asserted not set - needs delay\n");
+                        e_dbg("PHY Reset Asserted not set - needs delay\n");
         }
 
         e1000e_get_cfg_done(hw);
@@ -3388,7 +3387,7 @@ static s32 e1000_get_cfg_done_ich8lan(struct e1000_hw *hw)
         } else {
                 if (e1000_valid_nvm_bank_detect_ich8lan(hw, &bank)) {
                         /* Maybe we should do a basic PHY config */
-                        hw_dbg(hw, "EEPROM not present\n");
+                        e_dbg("EEPROM not present\n");
                         return -E1000_ERR_CONFIG;
                 }
         }
diff --git a/drivers/net/e1000e/lib.c b/drivers/net/e1000e/lib.c
index 5a670a2230e7..fa31c51e5642 100644
--- a/drivers/net/e1000e/lib.c
+++ b/drivers/net/e1000e/lib.c
@@ -110,12 +110,12 @@ void e1000e_init_rx_addrs(struct e1000_hw *hw, u16 rar_count)
         u32 i;
 
         /* Setup the receive address */
-        hw_dbg(hw, "Programming MAC Address into RAR[0]\n");
+        e_dbg("Programming MAC Address into RAR[0]\n");
 
         e1000e_rar_set(hw, hw->mac.addr, 0);
 
         /* Zero out the other (rar_entry_count - 1) receive addresses */
-        hw_dbg(hw, "Clearing RAR[1-%u]\n", rar_count-1);
+        e_dbg("Clearing RAR[1-%u]\n", rar_count-1);
         for (i = 1; i < rar_count; i++) {
                 E1000_WRITE_REG_ARRAY(hw, E1000_RA, (i << 1), 0);
                 e1e_flush();
@@ -271,7 +271,7 @@ void e1000e_update_mc_addr_list_generic(struct e1000_hw *hw,
         for (; mc_addr_count > 0; mc_addr_count--) {
                 u32 hash_value, hash_reg, hash_bit, mta;
                 hash_value = e1000_hash_mc_addr(hw, mc_addr_list);
-                hw_dbg(hw, "Hash value = 0x%03X\n", hash_value);
+                e_dbg("Hash value = 0x%03X\n", hash_value);
                 hash_reg = (hash_value >> 5) & (hw->mac.mta_reg_count - 1);
                 hash_bit = hash_value & 0x1F;
                 mta = (1 << hash_bit);
@@ -403,7 +403,7 @@ s32 e1000e_check_for_copper_link(struct e1000_hw *hw)
          */
         ret_val = e1000e_config_fc_after_link_up(hw);
         if (ret_val) {
-                hw_dbg(hw, "Error configuring flow control\n");
+                e_dbg("Error configuring flow control\n");
         }
 
         return ret_val;
@@ -443,7 +443,7 @@ s32 e1000e_check_for_fiber_link(struct e1000_hw *hw)
                         mac->autoneg_failed = 1;
                         return 0;
                 }
-                hw_dbg(hw, "NOT RXing /C/, disable AutoNeg and force link.\n");
+                e_dbg("NOT RXing /C/, disable AutoNeg and force link.\n");
 
                 /* Disable auto-negotiation in the TXCW register */
                 ew32(TXCW, (mac->txcw & ~E1000_TXCW_ANE));
@@ -456,7 +456,7 @@ s32 e1000e_check_for_fiber_link(struct e1000_hw *hw)
                 /* Configure Flow Control after forcing link up. */
                 ret_val = e1000e_config_fc_after_link_up(hw);
                 if (ret_val) {
-                        hw_dbg(hw, "Error configuring flow control\n");
+                        e_dbg("Error configuring flow control\n");
                         return ret_val;
                 }
         } else if ((ctrl & E1000_CTRL_SLU) && (rxcw & E1000_RXCW_C)) {
@@ -466,7 +466,7 @@ s32 e1000e_check_for_fiber_link(struct e1000_hw *hw)
                  * and disable forced link in the Device Control register
                  * in an attempt to auto-negotiate with our link partner.
                  */
-                hw_dbg(hw, "RXing /C/, enable AutoNeg and stop forcing link.\n");
+                e_dbg("RXing /C/, enable AutoNeg and stop forcing link.\n");
                 ew32(TXCW, mac->txcw);
                 ew32(CTRL, (ctrl & ~E1000_CTRL_SLU));
 
@@ -508,7 +508,7 @@ s32 e1000e_check_for_serdes_link(struct e1000_hw *hw)
                         mac->autoneg_failed = 1;
                         return 0;
                 }
-                hw_dbg(hw, "NOT RXing /C/, disable AutoNeg and force link.\n");
+                e_dbg("NOT RXing /C/, disable AutoNeg and force link.\n");
 
                 /* Disable auto-negotiation in the TXCW register */
                 ew32(TXCW, (mac->txcw & ~E1000_TXCW_ANE));
@@ -521,7 +521,7 @@ s32 e1000e_check_for_serdes_link(struct e1000_hw *hw)
                 /* Configure Flow Control after forcing link up. */
                 ret_val = e1000e_config_fc_after_link_up(hw);
                 if (ret_val) {
-                        hw_dbg(hw, "Error configuring flow control\n");
+                        e_dbg("Error configuring flow control\n");
                         return ret_val;
                 }
         } else if ((ctrl & E1000_CTRL_SLU) && (rxcw & E1000_RXCW_C)) {
@@ -531,7 +531,7 @@ s32 e1000e_check_for_serdes_link(struct e1000_hw *hw)
                  * and disable forced link in the Device Control register
                  * in an attempt to auto-negotiate with our link partner.
                  */
-                hw_dbg(hw, "RXing /C/, enable AutoNeg and stop forcing link.\n");
+                e_dbg("RXing /C/, enable AutoNeg and stop forcing link.\n");
                 ew32(TXCW, mac->txcw);
                 ew32(CTRL, (ctrl & ~E1000_CTRL_SLU));
 
@@ -548,11 +548,11 @@ s32 e1000e_check_for_serdes_link(struct e1000_hw *hw)
                 if (rxcw & E1000_RXCW_SYNCH) {
                         if (!(rxcw & E1000_RXCW_IV)) {
                                 mac->serdes_has_link = true;
-                                hw_dbg(hw, "SERDES: Link up - forced.\n");
+                                e_dbg("SERDES: Link up - forced.\n");
                         }
                 } else {
                         mac->serdes_has_link = false;
-                        hw_dbg(hw, "SERDES: Link down - force failed.\n");
+                        e_dbg("SERDES: Link down - force failed.\n");
                 }
         }
 
@@ -565,20 +565,20 @@ s32 e1000e_check_for_serdes_link(struct e1000_hw *hw)
                         if (rxcw & E1000_RXCW_SYNCH) {
                                 if (!(rxcw & E1000_RXCW_IV)) {
                                         mac->serdes_has_link = true;
-                                        hw_dbg(hw, "SERDES: Link up - autoneg "
+                                        e_dbg("SERDES: Link up - autoneg "
                                            "completed sucessfully.\n");
                                 } else {
                                         mac->serdes_has_link = false;
-                                        hw_dbg(hw, "SERDES: Link down - invalid"
+                                        e_dbg("SERDES: Link down - invalid"
                                            "codewords detected in autoneg.\n");
                                 }
                         } else {
                                 mac->serdes_has_link = false;
-                                hw_dbg(hw, "SERDES: Link down - no sync.\n");
+                                e_dbg("SERDES: Link down - no sync.\n");
                         }
                 } else {
                         mac->serdes_has_link = false;
-                        hw_dbg(hw, "SERDES: Link down - autoneg failed\n");
+                        e_dbg("SERDES: Link down - autoneg failed\n");
                 }
         }
 
@@ -609,7 +609,7 @@ static s32 e1000_set_default_fc_generic(struct e1000_hw *hw)
         ret_val = e1000_read_nvm(hw, NVM_INIT_CONTROL2_REG, 1, &nvm_data);
 
         if (ret_val) {
-                hw_dbg(hw, "NVM Read Error\n");
+                e_dbg("NVM Read Error\n");
                 return ret_val;
         }
 
@@ -662,7 +662,7 @@ s32 e1000e_setup_link(struct e1000_hw *hw)
          */
         hw->fc.current_mode = hw->fc.requested_mode;
 
-        hw_dbg(hw, "After fix-ups FlowControl is now = %x\n",
+        e_dbg("After fix-ups FlowControl is now = %x\n",
                 hw->fc.current_mode);
 
         /* Call the necessary media_type subroutine to configure the link. */
@@ -676,7 +676,7 @@ s32 e1000e_setup_link(struct e1000_hw *hw)
          * control is disabled, because it does not hurt anything to
          * initialize these registers.
          */
-        hw_dbg(hw, "Initializing the Flow Control address, type and timer regs\n");
+        e_dbg("Initializing the Flow Control address, type and timer regs\n");
         ew32(FCT, FLOW_CONTROL_TYPE);
         ew32(FCAH, FLOW_CONTROL_ADDRESS_HIGH);
         ew32(FCAL, FLOW_CONTROL_ADDRESS_LOW);
@@ -746,7 +746,7 @@ static s32 e1000_commit_fc_settings_generic(struct e1000_hw *hw)
                 txcw = (E1000_TXCW_ANE | E1000_TXCW_FD | E1000_TXCW_PAUSE_MASK);
                 break;
         default:
-                hw_dbg(hw, "Flow control param set incorrectly\n");
+                e_dbg("Flow control param set incorrectly\n");
                 return -E1000_ERR_CONFIG;
                 break;
         }
@@ -784,7 +784,7 @@ static s32 e1000_poll_fiber_serdes_link_generic(struct e1000_hw *hw)
                         break;
         }
         if (i == FIBER_LINK_UP_LIMIT) {
-                hw_dbg(hw, "Never got a valid link from auto-neg!!!\n");
+                e_dbg("Never got a valid link from auto-neg!!!\n");
                 mac->autoneg_failed = 1;
                 /*
                  * AutoNeg failed to achieve a link, so we'll call
@@ -794,13 +794,13 @@ static s32 e1000_poll_fiber_serdes_link_generic(struct e1000_hw *hw)
                  */
                 ret_val = mac->ops.check_for_link(hw);
                 if (ret_val) {
-                        hw_dbg(hw, "Error while checking for link\n");
+                        e_dbg("Error while checking for link\n");
                         return ret_val;
                 }
                 mac->autoneg_failed = 0;
         } else {
                 mac->autoneg_failed = 0;
-                hw_dbg(hw, "Valid Link Found\n");
+                e_dbg("Valid Link Found\n");
         }
 
         return 0;
@@ -836,7 +836,7 @@ s32 e1000e_setup_fiber_serdes_link(struct e1000_hw *hw)
          * then the link-up status bit will be set and the flow control enable
          * bits (RFCE and TFCE) will be set according to their negotiated value.
          */
-        hw_dbg(hw, "Auto-negotiation enabled\n");
+        e_dbg("Auto-negotiation enabled\n");
 
         ew32(CTRL, ctrl);
         e1e_flush();
@@ -851,7 +851,7 @@ s32 e1000e_setup_fiber_serdes_link(struct e1000_hw *hw)
             (er32(CTRL) & E1000_CTRL_SWDPIN1)) {
                 ret_val = e1000_poll_fiber_serdes_link_generic(hw);
         } else {
-                hw_dbg(hw, "No signal detected\n");
+                e_dbg("No signal detected\n");
         }
 
         return 0;
@@ -947,7 +947,7 @@ s32 e1000e_force_mac_fc(struct e1000_hw *hw)
          *      3:  Both Rx and Tx flow control (symmetric) is enabled.
          *  other:  No other values should be possible at this point.
          */
-        hw_dbg(hw, "hw->fc.current_mode = %u\n", hw->fc.current_mode);
+        e_dbg("hw->fc.current_mode = %u\n", hw->fc.current_mode);
 
         switch (hw->fc.current_mode) {
         case e1000_fc_none:
@@ -965,7 +965,7 @@ s32 e1000e_force_mac_fc(struct e1000_hw *hw)
                 ctrl |= (E1000_CTRL_TFCE | E1000_CTRL_RFCE);
                 break;
         default:
-                hw_dbg(hw, "Flow control param set incorrectly\n");
+                e_dbg("Flow control param set incorrectly\n");
                 return -E1000_ERR_CONFIG;
         }
 
@@ -1006,7 +1006,7 @@ s32 e1000e_config_fc_after_link_up(struct e1000_hw *hw)
         }
 
         if (ret_val) {
-                hw_dbg(hw, "Error forcing flow control settings\n");
+                e_dbg("Error forcing flow control settings\n");
                 return ret_val;
         }
 
@@ -1030,7 +1030,7 @@ s32 e1000e_config_fc_after_link_up(struct e1000_hw *hw)
                         return ret_val;
 
                 if (!(mii_status_reg & MII_SR_AUTONEG_COMPLETE)) {
-                        hw_dbg(hw, "Copper PHY and Auto Neg "
+                        e_dbg("Copper PHY and Auto Neg "
                                  "has not completed.\n");
                         return ret_val;
                 }
@@ -1095,10 +1095,10 @@ s32 e1000e_config_fc_after_link_up(struct e1000_hw *hw)
                          */
                         if (hw->fc.requested_mode == e1000_fc_full) {
                                 hw->fc.current_mode = e1000_fc_full;
-                                hw_dbg(hw, "Flow Control = FULL.\r\n");
+                                e_dbg("Flow Control = FULL.\r\n");
                         } else {
                                 hw->fc.current_mode = e1000_fc_rx_pause;
-                                hw_dbg(hw, "Flow Control = "
+                                e_dbg("Flow Control = "
                                          "RX PAUSE frames only.\r\n");
                         }
                 }
@@ -1116,7 +1116,7 @@ s32 e1000e_config_fc_after_link_up(struct e1000_hw *hw)
                           (mii_nway_lp_ability_reg & NWAY_LPAR_PAUSE) &&
                           (mii_nway_lp_ability_reg & NWAY_LPAR_ASM_DIR)) {
                         hw->fc.current_mode = e1000_fc_tx_pause;
-                        hw_dbg(hw, "Flow Control = Tx PAUSE frames only.\r\n");
+                        e_dbg("Flow Control = Tx PAUSE frames only.\r\n");
                 }
                 /*
                  * For transmitting PAUSE frames ONLY.
@@ -1132,14 +1132,14 @@ s32 e1000e_config_fc_after_link_up(struct e1000_hw *hw)
                          !(mii_nway_lp_ability_reg & NWAY_LPAR_PAUSE) &&
                          (mii_nway_lp_ability_reg & NWAY_LPAR_ASM_DIR)) {
                         hw->fc.current_mode = e1000_fc_rx_pause;
-                        hw_dbg(hw, "Flow Control = Rx PAUSE frames only.\r\n");
+                        e_dbg("Flow Control = Rx PAUSE frames only.\r\n");
                 } else {
                         /*
                          * Per the IEEE spec, at this point flow control
                          * should be disabled.
                          */
                         hw->fc.current_mode = e1000_fc_none;
-                        hw_dbg(hw, "Flow Control = NONE.\r\n");
+                        e_dbg("Flow Control = NONE.\r\n");
                 }
 
                 /*
@@ -1149,7 +1149,7 @@ s32 e1000e_config_fc_after_link_up(struct e1000_hw *hw)
                  */
                 ret_val = mac->ops.get_link_up_info(hw, &speed, &duplex);
                 if (ret_val) {
-                        hw_dbg(hw, "Error getting link speed and duplex\n");
+                        e_dbg("Error getting link speed and duplex\n");
                         return ret_val;
                 }
 
@@ -1162,7 +1162,7 @@ s32 e1000e_config_fc_after_link_up(struct e1000_hw *hw)
                  */
                 ret_val = e1000e_force_mac_fc(hw);
                 if (ret_val) {
-                        hw_dbg(hw, "Error forcing flow control settings\n");
+                        e_dbg("Error forcing flow control settings\n");
                         return ret_val;
                 }
         }
@@ -1186,21 +1186,21 @@ s32 e1000e_get_speed_and_duplex_copper(struct e1000_hw *hw, u16 *speed, u16 *dup
         status = er32(STATUS);
         if (status & E1000_STATUS_SPEED_1000) {
                 *speed = SPEED_1000;
-                hw_dbg(hw, "1000 Mbs, ");
+                e_dbg("1000 Mbs, ");
         } else if (status & E1000_STATUS_SPEED_100) {
                 *speed = SPEED_100;
-                hw_dbg(hw, "100 Mbs, ");
+                e_dbg("100 Mbs, ");
         } else {
                 *speed = SPEED_10;
-                hw_dbg(hw, "10 Mbs, ");
+                e_dbg("10 Mbs, ");
         }
 
         if (status & E1000_STATUS_FD) {
                 *duplex = FULL_DUPLEX;
-                hw_dbg(hw, "Full Duplex\n");
+                e_dbg("Full Duplex\n");
         } else {
                 *duplex = HALF_DUPLEX;
-                hw_dbg(hw, "Half Duplex\n");
+                e_dbg("Half Duplex\n");
         }
 
         return 0;
@@ -1246,7 +1246,7 @@ s32 e1000e_get_hw_semaphore(struct e1000_hw *hw)
         }
 
         if (i == timeout) {
-                hw_dbg(hw, "Driver can't access device - SMBI bit is set.\n");
+                e_dbg("Driver can't access device - SMBI bit is set.\n");
                 return -E1000_ERR_NVM;
         }
 
@@ -1265,7 +1265,7 @@ s32 e1000e_get_hw_semaphore(struct e1000_hw *hw)
         if (i == timeout) {
                 /* Release semaphores */
                 e1000e_put_hw_semaphore(hw);
-                hw_dbg(hw, "Driver can't access the NVM\n");
+                e_dbg("Driver can't access the NVM\n");
                 return -E1000_ERR_NVM;
         }
 
@@ -1305,7 +1305,7 @@ s32 e1000e_get_auto_rd_done(struct e1000_hw *hw)
         }
 
         if (i == AUTO_READ_DONE_TIMEOUT) {
-                hw_dbg(hw, "Auto read by HW from NVM has not completed.\n");
+                e_dbg("Auto read by HW from NVM has not completed.\n");
                 return -E1000_ERR_RESET;
         }
 
@@ -1326,7 +1326,7 @@ s32 e1000e_valid_led_default(struct e1000_hw *hw, u16 *data)
 
         ret_val = e1000_read_nvm(hw, NVM_ID_LED_SETTINGS, 1, data);
         if (ret_val) {
-                hw_dbg(hw, "NVM Read Error\n");
+                e_dbg("NVM Read Error\n");
                 return ret_val;
         }
 
@@ -1580,7 +1580,7 @@ s32 e1000e_disable_pcie_master(struct e1000_hw *hw)
         }
 
         if (!timeout) {
-                hw_dbg(hw, "Master requests are pending.\n");
+                e_dbg("Master requests are pending.\n");
                 return -E1000_ERR_MASTER_REQUESTS_PENDING;
         }
 
@@ -1804,7 +1804,7 @@ s32 e1000e_acquire_nvm(struct e1000_hw *hw)
         if (!timeout) {
                 eecd &= ~E1000_EECD_REQ;
                 ew32(EECD, eecd);
-                hw_dbg(hw, "Could not acquire NVM grant\n");
+                e_dbg("Could not acquire NVM grant\n");
                 return -E1000_ERR_NVM;
         }
 
@@ -1909,7 +1909,7 @@ static s32 e1000_ready_nvm_eeprom(struct e1000_hw *hw)
                 }
 
                 if (!timeout) {
-                        hw_dbg(hw, "SPI NVM Status error\n");
+                        e_dbg("SPI NVM Status error\n");
                         return -E1000_ERR_NVM;
                 }
         }
@@ -1938,7 +1938,7 @@ s32 e1000e_read_nvm_eerd(struct e1000_hw *hw, u16 offset, u16 words, u16 *data)
          */
         if ((offset >= nvm->word_size) || (words > (nvm->word_size - offset)) ||
             (words == 0)) {
-                hw_dbg(hw, "nvm parameter(s) out of bounds\n");
+                e_dbg("nvm parameter(s) out of bounds\n");
                 return -E1000_ERR_NVM;
         }
 
@@ -1981,7 +1981,7 @@ s32 e1000e_write_nvm_spi(struct e1000_hw *hw, u16 offset, u16 words, u16 *data)
          */
         if ((offset >= nvm->word_size) || (words > (nvm->word_size - offset)) ||
             (words == 0)) {
-                hw_dbg(hw, "nvm parameter(s) out of bounds\n");
+                e_dbg("nvm parameter(s) out of bounds\n");
                 return -E1000_ERR_NVM;
         }
 
@@ -2061,7 +2061,7 @@ s32 e1000e_read_mac_addr(struct e1000_hw *hw)
                 ret_val = e1000_read_nvm(hw, NVM_ALT_MAC_ADDR_PTR, 1,
                                          &mac_addr_offset);
                 if (ret_val) {
-                        hw_dbg(hw, "NVM Read Error\n");
+                        e_dbg("NVM Read Error\n");
                         return ret_val;
                 }
                 if (mac_addr_offset == 0xFFFF)
@@ -2076,7 +2076,7 @@ s32 e1000e_read_mac_addr(struct e1000_hw *hw)
                         ret_val = e1000_read_nvm(hw, mac_addr_offset, 1,
                                                  &nvm_data);
                         if (ret_val) {
-                                hw_dbg(hw, "NVM Read Error\n");
+                                e_dbg("NVM Read Error\n");
                                 return ret_val;
                         }
                         if (nvm_data & 0x0001)
@@ -2091,7 +2091,7 @@ s32 e1000e_read_mac_addr(struct e1000_hw *hw)
                 offset = mac_addr_offset + (i >> 1);
                 ret_val = e1000_read_nvm(hw, offset, 1, &nvm_data);
                 if (ret_val) {
-                        hw_dbg(hw, "NVM Read Error\n");
+                        e_dbg("NVM Read Error\n");
                         return ret_val;
                 }
                 hw->mac.perm_addr[i] = (u8)(nvm_data & 0xFF);
@@ -2124,14 +2124,14 @@ s32 e1000e_validate_nvm_checksum_generic(struct e1000_hw *hw)
         for (i = 0; i < (NVM_CHECKSUM_REG + 1); i++) {
                 ret_val = e1000_read_nvm(hw, i, 1, &nvm_data);
                 if (ret_val) {
-                        hw_dbg(hw, "NVM Read Error\n");
+                        e_dbg("NVM Read Error\n");
                         return ret_val;
                 }
                 checksum += nvm_data;
         }
 
         if (checksum != (u16) NVM_SUM) {
-                hw_dbg(hw, "NVM Checksum Invalid\n");
+                e_dbg("NVM Checksum Invalid\n");
                 return -E1000_ERR_NVM;
         }
 
@@ -2155,7 +2155,7 @@ s32 e1000e_update_nvm_checksum_generic(struct e1000_hw *hw)
         for (i = 0; i < NVM_CHECKSUM_REG; i++) {
                 ret_val = e1000_read_nvm(hw, i, 1, &nvm_data);
                 if (ret_val) {
-                        hw_dbg(hw, "NVM Read Error while updating checksum.\n");
+                        e_dbg("NVM Read Error while updating checksum.\n");
                         return ret_val;
                 }
                 checksum += nvm_data;
@@ -2163,7 +2163,7 @@ s32 e1000e_update_nvm_checksum_generic(struct e1000_hw *hw)
         checksum = (u16) NVM_SUM - checksum;
         ret_val = e1000_write_nvm(hw, NVM_CHECKSUM_REG, 1, &checksum);
         if (ret_val)
-                hw_dbg(hw, "NVM Write Error while updating checksum.\n");
+                e_dbg("NVM Write Error while updating checksum.\n");
 
         return ret_val;
 }
@@ -2226,7 +2226,7 @@ static s32 e1000_mng_enable_host_if(struct e1000_hw *hw)
         /* Check that the host interface is enabled. */
         hicr = er32(HICR);
         if ((hicr & E1000_HICR_EN) == 0) {
-                hw_dbg(hw, "E1000_HOST_EN bit disabled.\n");
+                e_dbg("E1000_HOST_EN bit disabled.\n");
                 return -E1000_ERR_HOST_INTERFACE_COMMAND;
         }
         /* check the previous command is completed */
@@ -2238,7 +2238,7 @@ static s32 e1000_mng_enable_host_if(struct e1000_hw *hw)
         }
 
         if (i == E1000_MNG_DHCP_COMMAND_TIMEOUT) {
-                hw_dbg(hw, "Previous command timeout failed .\n");
+                e_dbg("Previous command timeout failed .\n");
                 return -E1000_ERR_HOST_INTERFACE_COMMAND;
         }
 
@@ -2509,14 +2509,14 @@ s32 e1000e_read_pba_num(struct e1000_hw *hw, u32 *pba_num)
 
         ret_val = e1000_read_nvm(hw, NVM_PBA_OFFSET_0, 1, &nvm_data);
         if (ret_val) {
-                hw_dbg(hw, "NVM Read Error\n");
+                e_dbg("NVM Read Error\n");
                 return ret_val;
         }
         *pba_num = (u32)(nvm_data << 16);
 
         ret_val = e1000_read_nvm(hw, NVM_PBA_OFFSET_1, 1, &nvm_data);
         if (ret_val) {
-                hw_dbg(hw, "NVM Read Error\n");
+                e_dbg("NVM Read Error\n");
                 return ret_val;
         }
         *pba_num |= nvm_data;
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c
index ff9f9f1725e3..0b5352307f16 100644
--- a/drivers/net/e1000e/netdev.c
+++ b/drivers/net/e1000e/netdev.c
@@ -65,17 +65,6 @@ static const struct e1000_info *e1000_info_tbl[] = {
         [board_pchlan]          = &e1000_pch_info,
 };
 
-#ifdef DEBUG
-/**
- * e1000_get_hw_dev_name - return device name string
- * used by hardware layer to print debugging information
- **/
-char *e1000e_get_hw_dev_name(struct e1000_hw *hw)
-{
-        return hw->adapter->netdev->name;
-}
-#endif
-
 /**
  * e1000_desc_unused - calculate if we have unused descriptors
  **/
@@ -415,6 +404,7 @@ static bool e1000_clean_rx_irq(struct e1000_adapter *adapter,
 {
         struct net_device *netdev = adapter->netdev;
         struct pci_dev *pdev = adapter->pdev;
+        struct e1000_hw *hw = &adapter->hw;
         struct e1000_ring *rx_ring = adapter->rx_ring;
         struct e1000_rx_desc *rx_desc, *next_rxd;
         struct e1000_buffer *buffer_info, *next_buffer;
@@ -464,8 +454,7 @@ static bool e1000_clean_rx_irq(struct e1000_adapter *adapter,
                  * packet, also make sure the frame isn't just CRC only */
                 if (!(status & E1000_RXD_STAT_EOP) || (length <= 4)) {
                         /* All receives must fit into a single buffer */
-                        e_dbg("%s: Receive packet consumed multiple buffers\n",
-                              netdev->name);
+                        e_dbg("Receive packet consumed multiple buffers\n");
                         /* recycle */
                         buffer_info->skb = skb;
                         goto next_desc;
@@ -682,6 +671,7 @@ static bool e1000_clean_tx_irq(struct e1000_adapter *adapter)
 static bool e1000_clean_rx_irq_ps(struct e1000_adapter *adapter,
                                   int *work_done, int work_to_do)
 {
+        struct e1000_hw *hw = &adapter->hw;
         union e1000_rx_desc_packet_split *rx_desc, *next_rxd;
         struct net_device *netdev = adapter->netdev;
         struct pci_dev *pdev = adapter->pdev;
@@ -725,8 +715,8 @@ static bool e1000_clean_rx_irq_ps(struct e1000_adapter *adapter,
                 buffer_info->dma = 0;
 
                 if (!(staterr & E1000_RXD_STAT_EOP)) {
-                        e_dbg("%s: Packet Split buffers didn't pick up the "
-                              "full packet\n", netdev->name);
+                        e_dbg("Packet Split buffers didn't pick up the full "
+                              "packet\n");
                         dev_kfree_skb_irq(skb);
                         goto next_desc;
                 }
@@ -739,8 +729,8 @@ static bool e1000_clean_rx_irq_ps(struct e1000_adapter *adapter,
                 length = le16_to_cpu(rx_desc->wb.middle.length0);
 
                 if (!length) {
-                        e_dbg("%s: Last part of the packet spanning multiple "
-                              "descriptors\n", netdev->name);
+                        e_dbg("Last part of the packet spanning multiple "
+                              "descriptors\n");
                         dev_kfree_skb_irq(skb);
                         goto next_desc;
                 }
@@ -2931,7 +2921,7 @@ static irqreturn_t e1000_intr_msi_test(int irq, void *data)
         struct e1000_hw *hw = &adapter->hw;
         u32 icr = er32(ICR);
 
-        e_dbg("%s: icr is %08X\n", netdev->name, icr);
+        e_dbg("icr is %08X\n", icr);
         if (icr & E1000_ICR_RXSEQ) {
                 adapter->flags &= ~FLAG_MSI_TEST_FAILED;
                 wmb();
@@ -3001,7 +2991,7 @@ static int e1000_test_msi_interrupt(struct e1000_adapter *adapter)
                 goto msi_test_failed;
 
         /* okay so the test worked, restore settings */
-        e_dbg("%s: MSI interrupt test succeeded!\n", netdev->name);
+        e_dbg("MSI interrupt test succeeded!\n");
 msi_test_failed:
         e1000e_set_interrupt_capability(adapter);
         e1000_request_irq(adapter);
diff --git a/drivers/net/e1000e/phy.c b/drivers/net/e1000e/phy.c
index 95a8196cf44c..cff1df204031 100644
--- a/drivers/net/e1000e/phy.c
+++ b/drivers/net/e1000e/phy.c
@@ -212,7 +212,7 @@ s32 e1000e_read_phy_reg_mdic(struct e1000_hw *hw, u32 offset, u16 *data)
         u32 i, mdic = 0;
 
         if (offset > MAX_PHY_REG_ADDRESS) {
-                hw_dbg(hw, "PHY Address %d is out of range\n", offset);
+                e_dbg("PHY Address %d is out of range\n", offset);
                 return -E1000_ERR_PARAM;
         }
 
@@ -239,11 +239,11 @@ s32 e1000e_read_phy_reg_mdic(struct e1000_hw *hw, u32 offset, u16 *data)
                         break;
         }
         if (!(mdic & E1000_MDIC_READY)) {
-                hw_dbg(hw, "MDI Read did not complete\n");
+                e_dbg("MDI Read did not complete\n");
                 return -E1000_ERR_PHY;
         }
         if (mdic & E1000_MDIC_ERROR) {
-                hw_dbg(hw, "MDI Error\n");
+                e_dbg("MDI Error\n");
                 return -E1000_ERR_PHY;
         }
         *data = (u16) mdic;
@@ -265,7 +265,7 @@ s32 e1000e_write_phy_reg_mdic(struct e1000_hw *hw, u32 offset, u16 data)
         u32 i, mdic = 0;
 
         if (offset > MAX_PHY_REG_ADDRESS) {
-                hw_dbg(hw, "PHY Address %d is out of range\n", offset);
+                e_dbg("PHY Address %d is out of range\n", offset);
                 return -E1000_ERR_PARAM;
         }
 
@@ -293,11 +293,11 @@ s32 e1000e_write_phy_reg_mdic(struct e1000_hw *hw, u32 offset, u16 data)
                         break;
         }
         if (!(mdic & E1000_MDIC_READY)) {
-                hw_dbg(hw, "MDI Write did not complete\n");
+                e_dbg("MDI Write did not complete\n");
                 return -E1000_ERR_PHY;
         }
         if (mdic & E1000_MDIC_ERROR) {
-                hw_dbg(hw, "MDI Error\n");
+                e_dbg("MDI Error\n");
                 return -E1000_ERR_PHY;
         }
 
@@ -786,7 +786,7 @@ s32 e1000e_copper_link_setup_m88(struct e1000_hw *hw)
         /* Commit the changes. */
         ret_val = e1000e_commit_phy(hw);
         if (ret_val) {
-                hw_dbg(hw, "Error committing the PHY changes\n");
+                e_dbg("Error committing the PHY changes\n");
                 return ret_val;
         }
 
@@ -823,7 +823,7 @@ s32 e1000e_copper_link_setup_igp(struct e1000_hw *hw)
 
         ret_val = e1000_phy_hw_reset(hw);
         if (ret_val) {
-                hw_dbg(hw, "Error resetting the PHY.\n");
+                e_dbg("Error resetting the PHY.\n");
                 return ret_val;
         }
 
@@ -836,7 +836,7 @@ s32 e1000e_copper_link_setup_igp(struct e1000_hw *hw)
         /* disable lplu d0 during driver init */
         ret_val = e1000_set_d0_lplu_state(hw, 0);
         if (ret_val) {
-                hw_dbg(hw, "Error Disabling LPLU D0\n");
+                e_dbg("Error Disabling LPLU D0\n");
                 return ret_val;
         }
         /* Configure mdi-mdix settings */
@@ -972,39 +972,39 @@ static s32 e1000_phy_setup_autoneg(struct e1000_hw *hw)
                                  NWAY_AR_10T_HD_CAPS);
         mii_1000t_ctrl_reg &= ~(CR_1000T_HD_CAPS | CR_1000T_FD_CAPS);
 
-        hw_dbg(hw, "autoneg_advertised %x\n", phy->autoneg_advertised);
+        e_dbg("autoneg_advertised %x\n", phy->autoneg_advertised);
 
         /* Do we want to advertise 10 Mb Half Duplex? */
         if (phy->autoneg_advertised & ADVERTISE_10_HALF) {
-                hw_dbg(hw, "Advertise 10mb Half duplex\n");
+                e_dbg("Advertise 10mb Half duplex\n");
                 mii_autoneg_adv_reg |= NWAY_AR_10T_HD_CAPS;
         }
 
         /* Do we want to advertise 10 Mb Full Duplex? */
         if (phy->autoneg_advertised & ADVERTISE_10_FULL) {
-                hw_dbg(hw, "Advertise 10mb Full duplex\n");
+                e_dbg("Advertise 10mb Full duplex\n");
                 mii_autoneg_adv_reg |= NWAY_AR_10T_FD_CAPS;
         }
 
         /* Do we want to advertise 100 Mb Half Duplex? */
         if (phy->autoneg_advertised & ADVERTISE_100_HALF) {
-                hw_dbg(hw, "Advertise 100mb Half duplex\n");
+                e_dbg("Advertise 100mb Half duplex\n");
                 mii_autoneg_adv_reg |= NWAY_AR_100TX_HD_CAPS;
         }
 
         /* Do we want to advertise 100 Mb Full Duplex? */
         if (phy->autoneg_advertised & ADVERTISE_100_FULL) {
-                hw_dbg(hw, "Advertise 100mb Full duplex\n");
+                e_dbg("Advertise 100mb Full duplex\n");
                 mii_autoneg_adv_reg |= NWAY_AR_100TX_FD_CAPS;
         }
 
         /* We do not allow the Phy to advertise 1000 Mb Half Duplex */
         if (phy->autoneg_advertised & ADVERTISE_1000_HALF)
-                hw_dbg(hw, "Advertise 1000mb Half duplex request denied!\n");
+                e_dbg("Advertise 1000mb Half duplex request denied!\n");
 
         /* Do we want to advertise 1000 Mb Full Duplex? */
         if (phy->autoneg_advertised & ADVERTISE_1000_FULL) {
-                hw_dbg(hw, "Advertise 1000mb Full duplex\n");
+                e_dbg("Advertise 1000mb Full duplex\n");
                 mii_1000t_ctrl_reg |= CR_1000T_FD_CAPS;
         }
 
@@ -1063,7 +1063,7 @@ static s32 e1000_phy_setup_autoneg(struct e1000_hw *hw)
                 mii_autoneg_adv_reg |= (NWAY_AR_ASM_DIR | NWAY_AR_PAUSE);
                 break;
         default:
-                hw_dbg(hw, "Flow control param set incorrectly\n");
+                e_dbg("Flow control param set incorrectly\n");
                 ret_val = -E1000_ERR_CONFIG;
                 return ret_val;
         }
@@ -1072,7 +1072,7 @@ static s32 e1000_phy_setup_autoneg(struct e1000_hw *hw)
         if (ret_val)
                 return ret_val;
 
-        hw_dbg(hw, "Auto-Neg Advertising %x\n", mii_autoneg_adv_reg);
+        e_dbg("Auto-Neg Advertising %x\n", mii_autoneg_adv_reg);
 
         if (phy->autoneg_mask & ADVERTISE_1000_FULL) {
                 ret_val = e1e_wphy(hw, PHY_1000T_CTRL, mii_1000t_ctrl_reg);
@@ -1109,13 +1109,13 @@ static s32 e1000_copper_link_autoneg(struct e1000_hw *hw)
         if (phy->autoneg_advertised == 0)
                 phy->autoneg_advertised = phy->autoneg_mask;
 
-        hw_dbg(hw, "Reconfiguring auto-neg advertisement params\n");
+        e_dbg("Reconfiguring auto-neg advertisement params\n");
         ret_val = e1000_phy_setup_autoneg(hw);
         if (ret_val) {
-                hw_dbg(hw, "Error Setting up Auto-Negotiation\n");
+                e_dbg("Error Setting up Auto-Negotiation\n");
                 return ret_val;
         }
-        hw_dbg(hw, "Restarting Auto-Neg\n");
+        e_dbg("Restarting Auto-Neg\n");
 
         /*
          * Restart auto-negotiation by setting the Auto Neg Enable bit and
@@ -1137,7 +1137,7 @@ static s32 e1000_copper_link_autoneg(struct e1000_hw *hw)
         if (phy->autoneg_wait_to_complete) {
                 ret_val = e1000_wait_autoneg(hw);
                 if (ret_val) {
-                        hw_dbg(hw, "Error while waiting for "
+                        e_dbg("Error while waiting for "
                                  "autoneg to complete\n");
                         return ret_val;
                 }
@@ -1175,10 +1175,10 @@ s32 e1000e_setup_copper_link(struct e1000_hw *hw)
                  * PHY will be set to 10H, 10F, 100H or 100F
                  * depending on user settings.
                  */
-                hw_dbg(hw, "Forcing Speed and Duplex\n");
+                e_dbg("Forcing Speed and Duplex\n");
                 ret_val = e1000_phy_force_speed_duplex(hw);
                 if (ret_val) {
-                        hw_dbg(hw, "Error Forcing Speed and Duplex\n");
+                        e_dbg("Error Forcing Speed and Duplex\n");
                         return ret_val;
                 }
         }
@@ -1195,11 +1195,11 @@ s32 e1000e_setup_copper_link(struct e1000_hw *hw)
                 return ret_val;
 
         if (link) {
-                hw_dbg(hw, "Valid link established!!!\n");
+                e_dbg("Valid link established!!!\n");
                 e1000e_config_collision_dist(hw);
                 ret_val = e1000e_config_fc_after_link_up(hw);
         } else {
-                hw_dbg(hw, "Unable to establish link!!!\n");
+                e_dbg("Unable to establish link!!!\n");
         }
 
         return ret_val;
@@ -1245,12 +1245,12 @@ s32 e1000e_phy_force_speed_duplex_igp(struct e1000_hw *hw)
         if (ret_val)
                 return ret_val;
 
-        hw_dbg(hw, "IGP PSCR: %X\n", phy_data);
+        e_dbg("IGP PSCR: %X\n", phy_data);
 
         udelay(1);
 
         if (phy->autoneg_wait_to_complete) {
-                hw_dbg(hw, "Waiting for forced speed/duplex link on IGP phy.\n");
+                e_dbg("Waiting for forced speed/duplex link on IGP phy.\n");
 
                 ret_val = e1000e_phy_has_link_generic(hw,
                                                      PHY_FORCE_LIMIT,
@@ -1260,7 +1260,7 @@ s32 e1000e_phy_force_speed_duplex_igp(struct e1000_hw *hw)
                         return ret_val;
 
                 if (!link)
-                        hw_dbg(hw, "Link taking longer than expected.\n");
+                        e_dbg("Link taking longer than expected.\n");
 
                 /* Try once more */
                 ret_val = e1000e_phy_has_link_generic(hw,
@@ -1304,7 +1304,7 @@ s32 e1000e_phy_force_speed_duplex_m88(struct e1000_hw *hw)
         if (ret_val)
                 return ret_val;
 
-        hw_dbg(hw, "M88E1000 PSCR: %X\n", phy_data);
+        e_dbg("M88E1000 PSCR: %X\n", phy_data);
 
         ret_val = e1e_rphy(hw, PHY_CONTROL, &phy_data);
         if (ret_val)
@@ -1322,7 +1322,7 @@ s32 e1000e_phy_force_speed_duplex_m88(struct e1000_hw *hw)
                 return ret_val;
 
         if (phy->autoneg_wait_to_complete) {
-                hw_dbg(hw, "Waiting for forced speed/duplex link on M88 phy.\n");
+                e_dbg("Waiting for forced speed/duplex link on M88 phy.\n");
 
                 ret_val = e1000e_phy_has_link_generic(hw, PHY_FORCE_LIMIT,
                                                      100000, &link);
@@ -1413,11 +1413,11 @@ void e1000e_phy_force_speed_duplex_setup(struct e1000_hw *hw, u16 *phy_ctrl)
         if (mac->forced_speed_duplex & E1000_ALL_HALF_DUPLEX) {
                 ctrl &= ~E1000_CTRL_FD;
                 *phy_ctrl &= ~MII_CR_FULL_DUPLEX;
-                hw_dbg(hw, "Half Duplex\n");
+                e_dbg("Half Duplex\n");
         } else {
                 ctrl |= E1000_CTRL_FD;
                 *phy_ctrl |= MII_CR_FULL_DUPLEX;
-                hw_dbg(hw, "Full Duplex\n");
+                e_dbg("Full Duplex\n");
         }
 
         /* Forcing 10mb or 100mb? */
@@ -1425,12 +1425,12 @@ void e1000e_phy_force_speed_duplex_setup(struct e1000_hw *hw, u16 *phy_ctrl)
                 ctrl |= E1000_CTRL_SPD_100;
                 *phy_ctrl |= MII_CR_SPEED_100;
                 *phy_ctrl &= ~(MII_CR_SPEED_1000 | MII_CR_SPEED_10);
-                hw_dbg(hw, "Forcing 100mb\n");
+                e_dbg("Forcing 100mb\n");
         } else {
                 ctrl &= ~(E1000_CTRL_SPD_1000 | E1000_CTRL_SPD_100);
                 *phy_ctrl |= MII_CR_SPEED_10;
                 *phy_ctrl &= ~(MII_CR_SPEED_1000 | MII_CR_SPEED_100);
-                hw_dbg(hw, "Forcing 10mb\n");
+                e_dbg("Forcing 10mb\n");
         }
 
         e1000e_config_collision_dist(hw);
@@ -1826,7 +1826,7 @@ s32 e1000e_get_phy_info_m88(struct e1000_hw *hw)
         bool link;
 
         if (hw->phy.media_type != e1000_media_type_copper) {
-                hw_dbg(hw, "Phy info is only valid for copper media\n");
+                e_dbg("Phy info is only valid for copper media\n");
                 return -E1000_ERR_CONFIG;
         }
 
@@ -1835,7 +1835,7 @@ s32 e1000e_get_phy_info_m88(struct e1000_hw *hw)
                 return ret_val;
 
         if (!link) {
-                hw_dbg(hw, "Phy info is only valid if link is up\n");
+                e_dbg("Phy info is only valid if link is up\n");
                 return -E1000_ERR_CONFIG;
         }
 
@@ -1903,7 +1903,7 @@ s32 e1000e_get_phy_info_igp(struct e1000_hw *hw)
                 return ret_val;
 
         if (!link) {
-                hw_dbg(hw, "Phy info is only valid if link is up\n");
+                e_dbg("Phy info is only valid if link is up\n");
                 return -E1000_ERR_CONFIG;
         }
 
@@ -2031,7 +2031,7 @@ s32 e1000e_get_cfg_done(struct e1000_hw *hw)
  **/
 s32 e1000e_phy_init_script_igp3(struct e1000_hw *hw)
 {
-        hw_dbg(hw, "Running IGP 3 PHY init script\n");
+        e_dbg("Running IGP 3 PHY init script\n");
 
         /* PHY init IGP 3 */
         /* Enable rise/fall, 10-mode work in class-A */
@@ -2474,7 +2474,7 @@ static s32 e1000_access_phy_wakeup_reg_bm(struct e1000_hw *hw, u32 offset,
         /* Gig must be disabled for MDIO accesses to page 800 */
         if ((hw->mac.type == e1000_pchlan) &&
            (!(er32(PHY_CTRL) & E1000_PHY_CTRL_GBE_DISABLE)))
-                hw_dbg(hw, "Attempting to access page 800 while gig enabled\n");
+                e_dbg("Attempting to access page 800 while gig enabled\n");
 
         /* All operations in this function are phy address 1 */
         hw->phy.addr = 1;
@@ -2884,7 +2884,7 @@ static s32 e1000_access_phy_debug_regs_hv(struct e1000_hw *hw, u32 offset,
         /* masking with 0x3F to remove the page from offset */
         ret_val = e1000e_write_phy_reg_mdic(hw, addr_reg, (u16)offset & 0x3F);
         if (ret_val) {
-                hw_dbg(hw, "Could not write PHY the HV address register\n");
+                e_dbg("Could not write PHY the HV address register\n");
                 goto out;
         }
 
@@ -2895,7 +2895,7 @@ static s32 e1000_access_phy_debug_regs_hv(struct e1000_hw *hw, u32 offset,
                 ret_val = e1000e_write_phy_reg_mdic(hw, data_reg, *data);
 
         if (ret_val) {
-                hw_dbg(hw, "Could not read data value from HV data register\n");
+                e_dbg("Could not read data value from HV data register\n");
                 goto out;
         }
 
@@ -3021,12 +3021,12 @@ s32 e1000_phy_force_speed_duplex_82577(struct e1000_hw *hw)
         if (ret_val)
                 goto out;
 
-        hw_dbg(hw, "I82577_PHY_CTRL_2: %X\n", phy_data);
+        e_dbg("I82577_PHY_CTRL_2: %X\n", phy_data);
 
         udelay(1);
 
         if (phy->autoneg_wait_to_complete) {
-                hw_dbg(hw, "Waiting for forced speed/duplex link on 82577 phy\n");
+                e_dbg("Waiting for forced speed/duplex link on 82577 phy\n");
 
                 ret_val = e1000e_phy_has_link_generic(hw,
                                                      PHY_FORCE_LIMIT,
@@ -3036,7 +3036,7 @@ s32 e1000_phy_force_speed_duplex_82577(struct e1000_hw *hw)
                         goto out;
 
                 if (!link)
-                        hw_dbg(hw, "Link taking longer than expected.\n");
+                        e_dbg("Link taking longer than expected.\n");
 
                 /* Try once more */
                 ret_val = e1000e_phy_has_link_generic(hw,
@@ -3072,7 +3072,7 @@ s32 e1000_get_phy_info_82577(struct e1000_hw *hw)
                 goto out;
 
         if (!link) {
-                hw_dbg(hw, "Phy info is only valid if link is up\n");
+                e_dbg("Phy info is only valid if link is up\n");
                 ret_val = -E1000_ERR_CONFIG;
                 goto out;
         }