igb: Do not overwrite mdicnfg register when accessing 82580 phy

This change removes the extra configuration we were doing on the mdicnfg
register which should be set by EEPROM and which we should not need to
write again afterwards.  This code was a holdover from some earlier
development work that was being done on a board with an incomplete EEPROM
and is no longer needed now that the production EEPROMs are in place.

Signed-off-by: Alexander Duyck <alexander.h.duyck@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/igb/e1000_82575.c b/drivers/net/igb/e1000_82575.c
index 0bc990ec4a8ed68021d36839de41db16b77ce8e3..ea944f518215af5837fc08f0653ce790c0893b1f 100644 (file)
--- a/drivers/net/igb/e1000_82575.c
+++ b/drivers/net/igb/e1000_82575.c
@@ -1446,7 +1446,6 @@ void igb_vmdq_set_replication_pf(struct e1000_hw *hw, bool enable)
  **/
 static s32 igb_read_phy_reg_82580(struct e1000_hw *hw, u32 offset, u16 *data)
 {
-       u32 mdicnfg = 0;
        s32 ret_val;
 
 
@@ -1454,15 +1453,6 @@ static s32 igb_read_phy_reg_82580(struct e1000_hw *hw, u32 offset, u16 *data)
        if (ret_val)
                goto out;
 
-       /*
-        * We config the phy address in MDICNFG register now. Same bits
-        * as before. The values in MDIC can be written but will be
-        * ignored. This allows us to call the old function after
-        * configuring the PHY address in the new register
-        */
-       mdicnfg = (hw->phy.addr << E1000_MDIC_PHY_SHIFT);
-       wr32(E1000_MDICNFG, mdicnfg);
-
        ret_val = igb_read_phy_reg_mdic(hw, offset, data);
 
        hw->phy.ops.release(hw);
@@ -1481,7 +1471,6 @@ out:
  **/
 static s32 igb_write_phy_reg_82580(struct e1000_hw *hw, u32 offset, u16 data)
 {
-       u32 mdicnfg = 0;
        s32 ret_val;
 
 
@@ -1489,15 +1478,6 @@ static s32 igb_write_phy_reg_82580(struct e1000_hw *hw, u32 offset, u16 data)
        if (ret_val)
                goto out;
 
-       /*
-        * We config the phy address in MDICNFG register now. Same bits
-        * as before. The values in MDIC can be written but will be
-        * ignored. This allows us to call the old function after
-        * configuring the PHY address in the new register
-        */
-       mdicnfg = (hw->phy.addr << E1000_MDIC_PHY_SHIFT);
-       wr32(E1000_MDICNFG, mdicnfg);
-
        ret_val = igb_write_phy_reg_mdic(hw, offset, data);
 
        hw->phy.ops.release(hw);