aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet
diff options
context:
space:
mode:
authorAlexander Duyck <alexander.h.duyck@intel.com>2011-07-14 23:06:01 -0400
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2011-09-16 00:18:21 -0400
commit35c7f8a1baa6245a0e66d6ee72502d96cbc2aa19 (patch)
tree83cf36b3840fc3b10a1be3c67e7ceafb50057d68 /drivers/net/ethernet
parent4cc6df29d9f4cf90dad8167cbbf5c21810ae56cf (diff)
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. 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>
Diffstat (limited to 'drivers/net/ethernet')
-rw-r--r--drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c
index 9c12b35232af..11e1d5cd40b9 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c
@@ -1570,26 +1570,26 @@ static int ixgbe_setup_loopback_test(struct ixgbe_adapter *adapter)
1570 1570
1571 /* X540 needs to set the MACC.FLU bit to force link up */ 1571 /* X540 needs to set the MACC.FLU bit to force link up */
1572 if (adapter->hw.mac.type == ixgbe_mac_X540) { 1572 if (adapter->hw.mac.type == ixgbe_mac_X540) {
1573 reg_data = IXGBE_READ_REG(&adapter->hw, IXGBE_MACC); 1573 reg_data = IXGBE_READ_REG(hw, IXGBE_MACC);
1574 reg_data |= IXGBE_MACC_FLU; 1574 reg_data |= IXGBE_MACC_FLU;
1575 IXGBE_WRITE_REG(&adapter->hw, IXGBE_MACC, reg_data); 1575 IXGBE_WRITE_REG(hw, IXGBE_MACC, reg_data);
1576 } 1576 }
1577 1577
1578 /* right now we only support MAC loopback in the driver */ 1578 /* right now we only support MAC loopback in the driver */
1579 reg_data = IXGBE_READ_REG(&adapter->hw, IXGBE_HLREG0); 1579 reg_data = IXGBE_READ_REG(hw, IXGBE_HLREG0);
1580 /* Setup MAC loopback */ 1580 /* Setup MAC loopback */
1581 reg_data |= IXGBE_HLREG0_LPBK; 1581 reg_data |= IXGBE_HLREG0_LPBK;
1582 IXGBE_WRITE_REG(&adapter->hw, IXGBE_HLREG0, reg_data); 1582 IXGBE_WRITE_REG(hw, IXGBE_HLREG0, reg_data);
1583 1583
1584 reg_data = IXGBE_READ_REG(&adapter->hw, IXGBE_FCTRL); 1584 reg_data = IXGBE_READ_REG(hw, IXGBE_FCTRL);
1585 reg_data |= IXGBE_FCTRL_BAM | IXGBE_FCTRL_SBP | IXGBE_FCTRL_MPE; 1585 reg_data |= IXGBE_FCTRL_BAM | IXGBE_FCTRL_SBP | IXGBE_FCTRL_MPE;
1586 IXGBE_WRITE_REG(&adapter->hw, IXGBE_FCTRL, reg_data); 1586 IXGBE_WRITE_REG(hw, IXGBE_FCTRL, reg_data);
1587 1587
1588 reg_data = IXGBE_READ_REG(&adapter->hw, IXGBE_AUTOC); 1588 reg_data = IXGBE_READ_REG(hw, IXGBE_AUTOC);
1589 reg_data &= ~IXGBE_AUTOC_LMS_MASK; 1589 reg_data &= ~IXGBE_AUTOC_LMS_MASK;
1590 reg_data |= IXGBE_AUTOC_LMS_10G_LINK_NO_AN | IXGBE_AUTOC_FLU; 1590 reg_data |= IXGBE_AUTOC_LMS_10G_LINK_NO_AN | IXGBE_AUTOC_FLU;
1591 IXGBE_WRITE_REG(&adapter->hw, IXGBE_AUTOC, reg_data); 1591 IXGBE_WRITE_REG(hw, IXGBE_AUTOC, reg_data);
1592 IXGBE_WRITE_FLUSH(&adapter->hw); 1592 IXGBE_WRITE_FLUSH(hw);
1593 usleep_range(10000, 20000); 1593 usleep_range(10000, 20000);
1594 1594
1595 /* Disable Atlas Tx lanes; re-enabled in reset path */ 1595 /* Disable Atlas Tx lanes; re-enabled in reset path */