ixgbe: refactor link setup code

Link code cleanup: a number of redundant functions and MAC variables are cleaned up,
with some functions being consolidated into a single-purpose code path.
Removed following deprecated link functions and mac variables
 * ixgbe_setup_copper_link_speed_82598
 * ixgbe_setup_mac_link_speed_multispeed_fiber
 * ixgbe_setup_mac_link_speed_82599
 * mac.autoneg, mac.autoneg_succeeded, phy.autoneg_wait_to_complete

Signed-off-by: Mallikarjuna R Chilakala <mallikarjuna.chilakala@intel.com>
Acked-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 8 insertions, 9 deletions

diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c
index f907836eed22..4042d878670e 100644
--- a/drivers/net/ixgbe/ixgbe_main.c
+++ b/drivers/net/ixgbe/ixgbe_main.c
@@ -2516,7 +2516,7 @@ static void ixgbe_sfp_link_config(struct ixgbe_adapter *adapter)
 static int ixgbe_non_sfp_link_config(struct ixgbe_hw *hw)
 {
         u32 autoneg;
-        bool link_up = false;
+        bool negotiation, link_up = false;
         u32 ret = IXGBE_ERR_LINK_SETUP;
 
         if (hw->mac.ops.check_link)
@@ -2526,13 +2526,12 @@ static int ixgbe_non_sfp_link_config(struct ixgbe_hw *hw)
                 goto link_cfg_out;
 
         if (hw->mac.ops.get_link_capabilities)
-                ret = hw->mac.ops.get_link_capabilities(hw, &autoneg,
-                                                        &hw->mac.autoneg);
+                ret = hw->mac.ops.get_link_capabilities(hw, &autoneg, &negotiation);
         if (ret)
                 goto link_cfg_out;
 
-        if (hw->mac.ops.setup_link_speed)
-                ret = hw->mac.ops.setup_link_speed(hw, autoneg, true, link_up);
+        if (hw->mac.ops.setup_link)
+                ret = hw->mac.ops.setup_link(hw, autoneg, negotiation, link_up);
 link_cfg_out:
         return ret;
 }
@@ -4517,14 +4516,14 @@ static void ixgbe_multispeed_fiber_task(struct work_struct *work)
                                                      multispeed_fiber_task);
         struct ixgbe_hw *hw = &adapter->hw;
         u32 autoneg;
+        bool negotiation;
 
         adapter->flags |= IXGBE_FLAG_IN_SFP_LINK_TASK;
         autoneg = hw->phy.autoneg_advertised;
         if ((!autoneg) && (hw->mac.ops.get_link_capabilities))
-                hw->mac.ops.get_link_capabilities(hw, &autoneg,
-                                                  &hw->mac.autoneg);
-        if (hw->mac.ops.setup_link_speed)
-                hw->mac.ops.setup_link_speed(hw, autoneg, true, true);
+                hw->mac.ops.get_link_capabilities(hw, &autoneg, &negotiation);
+        if (hw->mac.ops.setup_link)
+                hw->mac.ops.setup_link(hw, autoneg, negotiation, true);
         adapter->flags |= IXGBE_FLAG_NEED_LINK_UPDATE;
         adapter->flags &= ~IXGBE_FLAG_IN_SFP_LINK_TASK;
 }