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

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

e1000e: cleanup: rename e1000_get_cfg_done() 



In keeping with the e1000e driver function naming convention, the subject
function is renamed to indicate it is generic, i.e. it is applicable to
more than just a single MAC family (e.g. 80003es2lan, 82571, ich8lan).

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 c2c6629b

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

+2 −2
Original line number Diff line number Diff line
@@ -1940,7 +1940,7 @@ static const struct e1000_phy_operations e82_phy_ops_m88 = { 
	.check_reset_block	= e1000e_check_reset_block_generic,

	.commit			= e1000e_phy_sw_reset,

	.force_speed_duplex	= e1000e_phy_force_speed_duplex_m88,

	.get_cfg_done		= e1000e_get_cfg_done,

	.get_cfg_done		= e1000e_get_cfg_done_generic,

	.get_cable_length	= e1000e_get_cable_length_m88,

	.get_info		= e1000e_get_phy_info_m88,

	.read_reg		= e1000e_read_phy_reg_m88,
@@ -1958,7 +1958,7 @@ static const struct e1000_phy_operations e82_phy_ops_bm = { 
	.check_reset_block	= e1000e_check_reset_block_generic,

	.commit			= e1000e_phy_sw_reset,

	.force_speed_duplex	= e1000e_phy_force_speed_duplex_m88,

	.get_cfg_done		= e1000e_get_cfg_done,

	.get_cfg_done		= e1000e_get_cfg_done_generic,

	.get_cable_length	= e1000e_get_cable_length_m88,

	.get_info		= e1000e_get_phy_info_m88,

	.read_reg		= e1000e_read_phy_reg_bm2,

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

+1 −1
Original line number Diff line number Diff line
@@ -654,7 +654,7 @@ extern s32 e1000e_write_phy_reg_igp_locked(struct e1000_hw *hw, u32 offset, 
                                           u16 data);

extern s32 e1000e_phy_sw_reset(struct e1000_hw *hw);

extern s32 e1000e_phy_force_speed_duplex_m88(struct e1000_hw *hw);

extern s32 e1000e_get_cfg_done(struct e1000_hw *hw);

extern s32 e1000e_get_cfg_done_generic(struct e1000_hw *hw);

extern s32 e1000e_get_cable_length_m88(struct e1000_hw *hw);

extern s32 e1000e_get_phy_info_m88(struct e1000_hw *hw);

extern s32 e1000e_read_phy_reg_m88(struct e1000_hw *hw, u32 offset, u16 *data);

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

+1 −1
Original line number Diff line number Diff line
@@ -4378,7 +4378,7 @@ static s32 e1000_get_cfg_done_ich8lan(struct e1000_hw *hw) 
	u32 bank = 0;

	u32 status;



	e1000e_get_cfg_done(hw);

	e1000e_get_cfg_done_generic(hw);



	/* Wait for indication from h/w that it has completed basic config */

	if (hw->mac.type >= e1000_ich10lan) {

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

+2 −2
Original line number Diff line number Diff line
@@ -2169,13 +2169,13 @@ s32 e1000e_phy_hw_reset_generic(struct e1000_hw *hw) 
}



/**

 *  e1000e_get_cfg_done - Generic configuration done

 *  e1000e_get_cfg_done_generic - Generic configuration done

 *  @hw: pointer to the HW structure

 *

 *  Generic function to wait 10 milli-seconds for configuration to complete

 *  and return success.

 **/

s32 e1000e_get_cfg_done(struct e1000_hw *hw)

s32 e1000e_get_cfg_done_generic(struct e1000_hw *hw)

{

	mdelay(10);