lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

e1000e: cleanup: rename e1000_get_cfg_done()

Browse Source 
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: 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>
This commit is contained in:
Bruce Allan
2013-01-05 08:06:14 +00:00
committed by Jeff Kirsher
parent c2c6629ba3
commit fe90849f76
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/ethernet/intel/e1000e/82571.c
View File

@@ -1940,7 +1940,7 @@ static const struct e1000_phy_operations e82_phy_ops_m88 = {
.check_reset_block = e1000e_check_reset_block_generic, .check_reset_block = e1000e_check_reset_block_generic,
.commit = e1000e_phy_sw_reset, .commit = e1000e_phy_sw_reset,
.force_speed_duplex = e1000e_phy_force_speed_duplex_m88, .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_cable_length = e1000e_get_cable_length_m88,
.get_info = e1000e_get_phy_info_m88, .get_info = e1000e_get_phy_info_m88,
.read_reg = e1000e_read_phy_reg_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, .check_reset_block = e1000e_check_reset_block_generic,
.commit = e1000e_phy_sw_reset, .commit = e1000e_phy_sw_reset,
.force_speed_duplex = e1000e_phy_force_speed_duplex_m88, .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_cable_length = e1000e_get_cable_length_m88,
.get_info = e1000e_get_phy_info_m88, .get_info = e1000e_get_phy_info_m88,
.read_reg = e1000e_read_phy_reg_bm2, .read_reg = e1000e_read_phy_reg_bm2,

2
drivers/net/ethernet/intel/e1000e/e1000.h
View File

@@ -654,7 +654,7 @@ extern s32 e1000e_write_phy_reg_igp_locked(struct e1000_hw *hw, u32 offset,
u16 data); u16 data);
extern s32 e1000e_phy_sw_reset(struct e1000_hw *hw); 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_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_cable_length_m88(struct e1000_hw *hw);
extern s32 e1000e_get_phy_info_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); extern s32 e1000e_read_phy_reg_m88(struct e1000_hw *hw, u32 offset, u16 *data);

2
drivers/net/ethernet/intel/e1000e/ich8lan.c
View File

@@ -4378,7 +4378,7 @@ static s32 e1000_get_cfg_done_ich8lan(struct e1000_hw *hw)
u32 bank = 0; u32 bank = 0;
u32 status; 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 */ /* Wait for indication from h/w that it has completed basic config */
if (hw->mac.type >= e1000_ich10lan) { if (hw->mac.type >= e1000_ich10lan) {

4
drivers/net/ethernet/intel/e1000e/phy.c
View File

@@ -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 * @hw: pointer to the HW structure
* *
* Generic function to wait 10 milli-seconds for configuration to complete * Generic function to wait 10 milli-seconds for configuration to complete
* and return success. * and return success.
**/ **/
s32 e1000e_get_cfg_done(struct e1000_hw *hw) s32 e1000e_get_cfg_done_generic(struct e1000_hw *hw)
{ {
mdelay(10); mdelay(10);