14 files changed, 91 insertions, 203 deletions

diff --git a/drivers/net/ethernet/intel/e1000/e1000_hw.c b/drivers/net/ethernet/intel/e1000/e1000_hw.c
index 2879b9631e15..c1d3fdb296a0 100644
--- a/drivers/net/ethernet/intel/e1000/e1000_hw.c
+++ b/drivers/net/ethernet/intel/e1000/e1000_hw.c
@@ -115,8 +115,6 @@ static DEFINE_SPINLOCK(e1000_phy_lock);
  */
 static s32 e1000_set_phy_type(struct e1000_hw *hw)
 {
-        e_dbg("e1000_set_phy_type");
-
         if (hw->mac_type == e1000_undefined)
                 return -E1000_ERR_PHY_TYPE;
 
@@ -159,8 +157,6 @@ static void e1000_phy_init_script(struct e1000_hw *hw)
         u32 ret_val;
         u16 phy_saved_data;
 
-        e_dbg("e1000_phy_init_script");
-
         if (hw->phy_init_script) {
                 msleep(20);
 
@@ -253,8 +249,6 @@ static void e1000_phy_init_script(struct e1000_hw *hw)
  */
 s32 e1000_set_mac_type(struct e1000_hw *hw)
 {
-        e_dbg("e1000_set_mac_type");
-
         switch (hw->device_id) {
         case E1000_DEV_ID_82542:
                 switch (hw->revision_id) {
@@ -365,8 +359,6 @@ void e1000_set_media_type(struct e1000_hw *hw)
 {
         u32 status;
 
-        e_dbg("e1000_set_media_type");
-
         if (hw->mac_type != e1000_82543) {
                 /* tbi_compatibility is only valid on 82543 */
                 hw->tbi_compatibility_en = false;
@@ -415,8 +407,6 @@ s32 e1000_reset_hw(struct e1000_hw *hw)
         u32 led_ctrl;
         s32 ret_val;
 
-        e_dbg("e1000_reset_hw");
-
         /* For 82542 (rev 2.0), disable MWI before issuing a device reset */
         if (hw->mac_type == e1000_82542_rev2_0) {
                 e_dbg("Disabling MWI on 82542 rev 2.0\n");
@@ -566,8 +556,6 @@ s32 e1000_init_hw(struct e1000_hw *hw)
         u32 mta_size;
         u32 ctrl_ext;
 
-        e_dbg("e1000_init_hw");
-
         /* Initialize Identification LED */
         ret_val = e1000_id_led_init(hw);
         if (ret_val) {
@@ -683,8 +671,6 @@ static s32 e1000_adjust_serdes_amplitude(struct e1000_hw *hw)
         u16 eeprom_data;
         s32 ret_val;
 
-        e_dbg("e1000_adjust_serdes_amplitude");
-
         if (hw->media_type != e1000_media_type_internal_serdes)
                 return E1000_SUCCESS;
 
@@ -730,8 +716,6 @@ s32 e1000_setup_link(struct e1000_hw *hw)
         s32 ret_val;
         u16 eeprom_data;
 
-        e_dbg("e1000_setup_link");
-
         /* Read and store word 0x0F of the EEPROM. This word contains bits
          * that determine the hardware's default PAUSE (flow control) mode,
          * a bit that determines whether the HW defaults to enabling or
@@ -848,8 +832,6 @@ static s32 e1000_setup_fiber_serdes_link(struct e1000_hw *hw)
         u32 signal = 0;
         s32 ret_val;
 
-        e_dbg("e1000_setup_fiber_serdes_link");
-
         /* On adapters with a MAC newer than 82544, SWDP 1 will be
          * set when the optics detect a signal. On older adapters, it will be
          * cleared when there is a signal.  This applies to fiber media only.
@@ -1051,8 +1033,6 @@ static s32 e1000_copper_link_preconfig(struct e1000_hw *hw)
         s32 ret_val;
         u16 phy_data;
 
-        e_dbg("e1000_copper_link_preconfig");
-
         ctrl = er32(CTRL);
         /* With 82543, we need to force speed and duplex on the MAC equal to
          * what the PHY speed and duplex configuration is. In addition, we need
@@ -1112,8 +1092,6 @@ static s32 e1000_copper_link_igp_setup(struct e1000_hw *hw)
         s32 ret_val;
         u16 phy_data;
 
-        e_dbg("e1000_copper_link_igp_setup");
-
         if (hw->phy_reset_disable)
                 return E1000_SUCCESS;
 
@@ -1254,8 +1232,6 @@ static s32 e1000_copper_link_mgp_setup(struct e1000_hw *hw)
         s32 ret_val;
         u16 phy_data;
 
-        e_dbg("e1000_copper_link_mgp_setup");
-
         if (hw->phy_reset_disable)
                 return E1000_SUCCESS;
 
@@ -1362,8 +1338,6 @@ static s32 e1000_copper_link_autoneg(struct e1000_hw *hw)
         s32 ret_val;
         u16 phy_data;
 
-        e_dbg("e1000_copper_link_autoneg");
-
         /* Perform some bounds checking on the hw->autoneg_advertised
          * parameter.  If this variable is zero, then set it to the default.
          */
@@ -1432,7 +1406,6 @@ static s32 e1000_copper_link_autoneg(struct e1000_hw *hw)
 static s32 e1000_copper_link_postconfig(struct e1000_hw *hw)
 {
         s32 ret_val;
-        e_dbg("e1000_copper_link_postconfig");
 
         if ((hw->mac_type >= e1000_82544) && (hw->mac_type != e1000_ce4100)) {
                 e1000_config_collision_dist(hw);
@@ -1473,8 +1446,6 @@ static s32 e1000_setup_copper_link(struct e1000_hw *hw)
         u16 i;
         u16 phy_data;