ixgbe: Drop unnecessary adapter->hw dereference in loopback test setup

This patch drops a set of unnecessary dereferences to the hardware structure
since we already have a local copy of the hardware pointer.

(cherry picked from commit 35c7f8a1baa6245a0e66d6ee72502d96cbc2aa19)
Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
Tested-by: Phil Schmitt <phillip.j.schmitt@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: Joe Jin <joe.jin@oracle.com>

diff --git a/drivers/net/ixgbe/ixgbe_ethtool.c b/drivers/net/ixgbe/ixgbe_ethtool.c
index e15f9c2a26cf4ad4310a4f2265417c4016b542f7..453bb65d2b359331455c0d13754b1581986cbb64 100644 (file)
--- a/drivers/net/ixgbe/ixgbe_ethtool.c
+++ b/drivers/net/ixgbe/ixgbe_ethtool.c
@@ -1565,26 +1565,26 @@ static int ixgbe_setup_loopback_test(struct ixgbe_adapter *adapter)
 
        /* X540 needs to set the MACC.FLU bit to force link up */
        if (adapter->hw.mac.type == ixgbe_mac_X540) {
-               reg_data = IXGBE_READ_REG(&adapter->hw, IXGBE_MACC);
+               reg_data = IXGBE_READ_REG(hw, IXGBE_MACC);
                reg_data |= IXGBE_MACC_FLU;
-               IXGBE_WRITE_REG(&adapter->hw, IXGBE_MACC, reg_data);
+               IXGBE_WRITE_REG(hw, IXGBE_MACC, reg_data);
        }
 
        /* right now we only support MAC loopback in the driver */
-       reg_data = IXGBE_READ_REG(&adapter->hw, IXGBE_HLREG0);
+       reg_data = IXGBE_READ_REG(hw, IXGBE_HLREG0);
        /* Setup MAC loopback */
        reg_data |= IXGBE_HLREG0_LPBK;
-       IXGBE_WRITE_REG(&adapter->hw, IXGBE_HLREG0, reg_data);
+       IXGBE_WRITE_REG(hw, IXGBE_HLREG0, reg_data);
 
-       reg_data = IXGBE_READ_REG(&adapter->hw, IXGBE_FCTRL);
+       reg_data = IXGBE_READ_REG(hw, IXGBE_FCTRL);
        reg_data |= IXGBE_FCTRL_BAM | IXGBE_FCTRL_SBP | IXGBE_FCTRL_MPE;
-       IXGBE_WRITE_REG(&adapter->hw, IXGBE_FCTRL, reg_data);
+       IXGBE_WRITE_REG(hw, IXGBE_FCTRL, reg_data);
 
-       reg_data = IXGBE_READ_REG(&adapter->hw, IXGBE_AUTOC);
+       reg_data = IXGBE_READ_REG(hw, IXGBE_AUTOC);
        reg_data &= ~IXGBE_AUTOC_LMS_MASK;
        reg_data |= IXGBE_AUTOC_LMS_10G_LINK_NO_AN | IXGBE_AUTOC_FLU;
-       IXGBE_WRITE_REG(&adapter->hw, IXGBE_AUTOC, reg_data);
-       IXGBE_WRITE_FLUSH(&adapter->hw);
+       IXGBE_WRITE_REG(hw, IXGBE_AUTOC, reg_data);
+       IXGBE_WRITE_FLUSH(hw);
        usleep_range(10000, 20000);
 
        /* Disable Atlas Tx lanes; re-enabled in reset path */