Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dde3a574 authored by Bruce Allan's avatar Bruce Allan Committed by Jeff Kirsher
Browse files

e1000e: cleanup: remove e1000_get_cable_length() 



Remove the function e1000_get_cable_length() and replace the two calls
to it with the same function pointer that it would call.

Signed-off-by: default avatarBruce Allan <bruce.w.allan@intel.com>
Tested-by: default avatarAaron Brown <aaron.f.brown@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 84c1befe

drivers/net/ethernet/intel/e1000e/e1000.h

+0 −5
Original line number Diff line number Diff line
@@ -737,11 +737,6 @@ static inline s32 e1e_wphy_locked(struct e1000_hw *hw, u32 offset, u16 data) 
	return hw->phy.ops.write_reg_locked(hw, offset, data);

}



static inline s32 e1000_get_cable_length(struct e1000_hw *hw)

{

	return hw->phy.ops.get_cable_length(hw);

}



extern s32 e1000e_acquire_nvm(struct e1000_hw *hw);

extern s32 e1000e_write_nvm_spi(struct e1000_hw *hw, u16 offset, u16 words, u16 *data);

extern s32 e1000e_update_nvm_checksum_generic(struct e1000_hw *hw);

drivers/net/ethernet/intel/e1000e/phy.c

+2 −2
Original line number Diff line number Diff line
@@ -1960,7 +1960,7 @@ s32 e1000e_get_phy_info_m88(struct e1000_hw *hw) 
	phy->is_mdix = !!(phy_data & M88E1000_PSSR_MDIX);



	if ((phy_data & M88E1000_PSSR_SPEED) == M88E1000_PSSR_1000MBS) {

		ret_val = e1000_get_cable_length(hw);

		ret_val = hw->phy.ops.get_cable_length(hw);

		if (ret_val)

			return ret_val;
@@ -2024,7 +2024,7 @@ s32 e1000e_get_phy_info_igp(struct e1000_hw *hw) 


	if ((data & IGP01E1000_PSSR_SPEED_MASK) ==

	    IGP01E1000_PSSR_SPEED_1000MBPS) {

		ret_val = e1000_get_cable_length(hw);

		ret_val = phy->ops.get_cable_length(hw);

		if (ret_val)

			return ret_val;