e1000e: use generic IEEE MII definitions
For standard IEEE MII-compatible transceivers, the kernel has generic register and bit definitions. Use those instead of redundant local defines. Do not replace references of MII_CR_SPEED_10 with BMCR_SPEED10 (0x0000) when it is not necessary (i.e. when it is bitwise OR'ed with another value). Some whitespace issues in the surrounding context of the above changes are also cleaned up. Signed-off-by: Bruce Allan <bruce.w.allan@intel.com> Tested-by: Aaron Brown <aaron.f.brown@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
This commit is contained in:

committed by
Jeff Kirsher

parent
8bb628697f
commit
c2ade1a41d
@@ -624,16 +624,16 @@ static s32 e1000_phy_force_speed_duplex_80003es2lan(struct e1000_hw *hw)
|
||||
|
||||
e_dbg("GG82563 PSCR: %X\n", phy_data);
|
||||
|
||||
ret_val = e1e_rphy(hw, PHY_CONTROL, &phy_data);
|
||||
ret_val = e1e_rphy(hw, MII_BMCR, &phy_data);
|
||||
if (ret_val)
|
||||
return ret_val;
|
||||
|
||||
e1000e_phy_force_speed_duplex_setup(hw, &phy_data);
|
||||
|
||||
/* Reset the phy to commit changes. */
|
||||
phy_data |= MII_CR_RESET;
|
||||
phy_data |= BMCR_RESET;
|
||||
|
||||
ret_val = e1e_wphy(hw, PHY_CONTROL, phy_data);
|
||||
ret_val = e1e_wphy(hw, MII_BMCR, phy_data);
|
||||
if (ret_val)
|
||||
return ret_val;
|
||||
|
||||
|
Reference in New Issue
Block a user