e1000e: cleanup use of check_reset_block function pointer

Replace e1000_check_reset_block() inline function with calls to the PHY ops
check_reset_block function pointer.

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>

diff --git a/drivers/net/ethernet/intel/e1000e/e1000.h b/drivers/net/ethernet/intel/e1000e/e1000.h
index bae094b6cdd96c21d9981de7c4d29720228cb4f3..f93d7a40e6ad96c65ef9dbe1f46c2fa7efdc5057 100644 (file)
--- a/drivers/net/ethernet/intel/e1000e/e1000.h
+++ b/drivers/net/ethernet/intel/e1000e/e1000.h
@@ -662,11 +662,6 @@ static inline s32 e1000_phy_hw_reset(struct e1000_hw *hw)
        return hw->phy.ops.reset(hw);
 }
 
-static inline s32 e1000_check_reset_block(struct e1000_hw *hw)
-{
-       return hw->phy.ops.check_reset_block(hw);
-}
-
 static inline s32 e1e_rphy(struct e1000_hw *hw, u32 offset, u16 *data)
 {
        return hw->phy.ops.read_reg(hw, offset, data);

diff --git a/drivers/net/ethernet/intel/e1000e/ethtool.c b/drivers/net/ethernet/intel/e1000e/ethtool.c
index b1f5d7491b57175cb8e840af1b32e7f83430e083..db35dd5d96de570445b3cd4e820bda2edea09a5c 100644 (file)
--- a/drivers/net/ethernet/intel/e1000e/ethtool.c
+++ b/drivers/net/ethernet/intel/e1000e/ethtool.c
@@ -258,7 +258,7 @@ static int e1000_set_settings(struct net_device *netdev,
         * When SoL/IDER sessions are active, autoneg/speed/duplex
         * cannot be changed
         */
-       if (e1000_check_reset_block(hw)) {
+       if (hw->phy.ops.check_reset_block(hw)) {
                e_err("Cannot change link characteristics when SoL/IDER is "
                      "active.\n");
                return -EINVAL;
@@ -1598,11 +1598,13 @@ static int e1000_run_loopback_test(struct e1000_adapter *adapter)
 
 static int e1000_loopback_test(struct e1000_adapter *adapter, u64 *data)
 {
+       struct e1000_hw *hw = &adapter->hw;
+
        /*
         * PHY loopback cannot be performed if SoL/IDER
         * sessions are active
         */
-       if (e1000_check_reset_block(&adapter->hw)) {
+       if (hw->phy.ops.check_reset_block(hw)) {
                e_err("Cannot do PHY loopback test when SoL/IDER is active.\n");
                *data = 0;
                goto out;

diff --git a/drivers/net/ethernet/intel/e1000e/ich8lan.c b/drivers/net/ethernet/intel/e1000e/ich8lan.c
index 8b9bf94f9887e0719d427d93be3daef806a685fc..da89e2b73b408d6333c140d3cd05bfdbcf508380 100644 (file)
--- a/drivers/net/ethernet/intel/e1000e/ich8lan.c
+++ b/drivers/net/ethernet/intel/e1000e/ich8lan.c
@@ -324,7 +324,7 @@ static s32 e1000_init_phy_params_pchlan(struct e1000_hw *hw)
        phy->ops.power_down           = e1000_power_down_phy_copper_ich8lan;
        phy->autoneg_mask             = AUTONEG_ADVERTISE_SPEED_DEFAULT;
 
-       if (!e1000_check_reset_block(hw)) {
+       if (!hw->phy.ops.check_reset_block(hw)) {
                u32 fwsm = er32(FWSM);
 
                /*
@@ -1314,7 +1314,7 @@ static s32 e1000_oem_bits_config_ich8lan(struct e1000_hw *hw, bool d0_state)
                        oem_reg |= HV_OEM_BITS_LPLU;
 
                /* Set Restart auto-neg to activate the bits */
-               if (!e1000_check_reset_block(hw))
+               if (!hw->phy.ops.check_reset_block(hw))
                        oem_reg |= HV_OEM_BITS_RESTART_AN;
        } else {
                if (mac_reg & (E1000_PHY_CTRL_GBE_DISABLE |
@@ -1788,7 +1788,7 @@ static s32 e1000_post_phy_reset_ich8lan(struct e1000_hw *hw)
        s32 ret_val = 0;
        u16 reg;
 
-       if (e1000_check_reset_block(hw))
+       if (hw->phy.ops.check_reset_block(hw))
                return 0;
 
        /* Allow time for h/w to get to quiescent state after reset */
@@ -1897,7 +1897,7 @@ static s32 e1000_set_lplu_state_pchlan(struct e1000_hw *hw, bool active)
        else
                oem_reg &= ~HV_OEM_BITS_LPLU;
 
-       if (!e1000_check_reset_block(hw))
+       if (!hw->phy.ops.check_reset_block(hw))
                oem_reg |= HV_OEM_BITS_RESTART_AN;
 
        return e1e_wphy(hw, HV_OEM_BITS, oem_reg);
@@ -3109,7 +3109,7 @@ static s32 e1000_reset_hw_ich8lan(struct e1000_hw *hw)
 
        ctrl = er32(CTRL);
 
-       if (!e1000_check_reset_block(hw)) {
+       if (!hw->phy.ops.check_reset_block(hw)) {
                /*
                 * Full-chip reset requires MAC and PHY reset at the same
                 * time to make sure the interface between MAC and the
@@ -3327,7 +3327,7 @@ static s32 e1000_setup_link_ich8lan(struct e1000_hw *hw)
 {
        s32 ret_val;
 
-       if (e1000_check_reset_block(hw))
+       if (hw->phy.ops.check_reset_block(hw))
                return 0;
 
        /*
@@ -3707,7 +3707,8 @@ void e1000_resume_workarounds_pchlan(struct e1000_hw *hw)
        u16 phy_id1, phy_id2;
        s32 ret_val;
 
-       if ((hw->mac.type != e1000_pch2lan) || e1000_check_reset_block(hw))
+       if ((hw->mac.type != e1000_pch2lan) ||
+           hw->phy.ops.check_reset_block(hw))
                return;
 
        ret_val = hw->phy.ops.acquire(hw);

diff --git a/drivers/net/ethernet/intel/e1000e/mac.c b/drivers/net/ethernet/intel/e1000e/mac.c
index 6e48895aa2ef14a04ffb8081c583205e593c4dc8..011d83ddad1e68425ec50103f11c8109dadfbe8d 100644 (file)
--- a/drivers/net/ethernet/intel/e1000e/mac.c
+++ b/drivers/net/ethernet/intel/e1000e/mac.c
@@ -711,7 +711,7 @@ s32 e1000e_setup_link_generic(struct e1000_hw *hw)
         * In the case of the phy reset being blocked, we already have a link.
         * We do not need to set it up again.
         */
-       if (e1000_check_reset_block(hw))
+       if (hw->phy.ops.check_reset_block(hw))
                return 0;
 
        /*

diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
index c30e99ee66c66256d5735dad7344c220c5ebc62a..3975ed1fb27965d45abce9fd125af6e86c2a41bf 100644 (file)
--- a/drivers/net/ethernet/intel/e1000e/netdev.c
+++ b/drivers/net/ethernet/intel/e1000e/netdev.c
@@ -6236,7 +6236,7 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
                adapter->hw.phy.ms_type = e1000_ms_hw_default;
        }
 
-       if (e1000_check_reset_block(&adapter->hw))
+       if (hw->phy.ops.check_reset_block(hw))
                e_info("PHY reset is blocked due to SOL/IDER session.\n");
 
        /* Set initial default active device features */
@@ -6403,7 +6403,7 @@ err_register:
        if (!(adapter->flags & FLAG_HAS_AMT))
                e1000e_release_hw_control(adapter);
 err_eeprom:
-       if (!e1000_check_reset_block(&adapter->hw))
+       if (!hw->phy.ops.check_reset_block(hw))
                e1000_phy_hw_reset(&adapter->hw);
 err_hw_init:
        kfree(adapter->tx_ring);

diff --git a/drivers/net/ethernet/intel/e1000e/phy.c b/drivers/net/ethernet/intel/e1000e/phy.c
index d4dbbe7412469227d02ce920b6a9c44e667804af..d10b27fee2019dad3cae5e679973fcfc7a9adfd1 100644 (file)
--- a/drivers/net/ethernet/intel/e1000e/phy.c
+++ b/drivers/net/ethernet/intel/e1000e/phy.c
@@ -2133,7 +2133,7 @@ s32 e1000e_phy_hw_reset_generic(struct e1000_hw *hw)
        s32 ret_val;
        u32 ctrl;
 
-       ret_val = e1000_check_reset_block(hw);
+       ret_val = phy->ops.check_reset_block(hw);
        if (ret_val)
                return 0;