leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

e1000e: pass pointer to hw struct for e1000_init_mac_params_XXX()

Browse Source 
The e1000_init_mac_params_XXX() functions (where XXX is one of the three
MAC-family types 80003es2lan, 82571 and ich8lan) was not meant to require a
pointer to the adapter struct but does require a pointer to the hw struct.
Pass that pointer in to the functions instead.

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 2012-02-01 10:53:05 +00:00 committed by Jeff Kirsher
parent 07914ee3cc
commit ec34c170da
3 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/net/ethernet/intel/e1000e/80003es2lan.c
View File

@ -201,13 +201,12 @@ static s32 e1000_init_nvm_params_80003es2lan(struct e1000_hw *hw)
* e1000_init_mac_params_80003es2lan - Init ESB2 MAC func ptrs. * e1000_init_mac_params_80003es2lan - Init ESB2 MAC func ptrs.
* @hw: pointer to the HW structure * @hw: pointer to the HW structure
**/ **/
static s32 e1000_init_mac_params_80003es2lan(struct e1000_adapter *adapter) static s32 e1000_init_mac_params_80003es2lan(struct e1000_hw *hw)
{ {
struct e1000_hw *hw = &adapter->hw;
struct e1000_mac_info *mac = &hw->mac; struct e1000_mac_info *mac = &hw->mac;
/* Set media type and media-dependent function pointers */ /* Set media type and media-dependent function pointers */
switch (adapter->pdev->device) { switch (hw->adapter->pdev->device) {
case E1000_DEV_ID_80003ES2LAN_SERDES_DPT: case E1000_DEV_ID_80003ES2LAN_SERDES_DPT:
hw->phy.media_type = e1000_media_type_internal_serdes; hw->phy.media_type = e1000_media_type_internal_serdes;
mac->ops.check_for_link = e1000e_check_for_serdes_link; mac->ops.check_for_link = e1000e_check_for_serdes_link;
@ -246,7 +245,7 @@ static s32 e1000_get_variants_80003es2lan(struct e1000_adapter *adapter)
struct e1000_hw *hw = &adapter->hw; struct e1000_hw *hw = &adapter->hw;
s32 rc; s32 rc;
rc = e1000_init_mac_params_80003es2lan(adapter); rc = e1000_init_mac_params_80003es2lan(hw);
if (rc) if (rc)
return rc; return rc;

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

@ -235,16 +235,15 @@ static s32 e1000_init_nvm_params_82571(struct e1000_hw *hw)
* e1000_init_mac_params_82571 - Init MAC func ptrs. * e1000_init_mac_params_82571 - Init MAC func ptrs.
* @hw: pointer to the HW structure * @hw: pointer to the HW structure
**/ **/
static s32 e1000_init_mac_params_82571(struct e1000_adapter *adapter) static s32 e1000_init_mac_params_82571(struct e1000_hw *hw)
{ {
struct e1000_hw *hw = &adapter->hw;
struct e1000_mac_info *mac = &hw->mac; struct e1000_mac_info *mac = &hw->mac;
u32 swsm = 0; u32 swsm = 0;
u32 swsm2 = 0; u32 swsm2 = 0;
bool force_clear_smbi = false; bool force_clear_smbi = false;
/* Set media type and media-dependent function pointers */ /* Set media type and media-dependent function pointers */
switch (adapter->pdev->device) { switch (hw->adapter->pdev->device) {
case E1000_DEV_ID_82571EB_FIBER: case E1000_DEV_ID_82571EB_FIBER:
case E1000_DEV_ID_82572EI_FIBER: case E1000_DEV_ID_82572EI_FIBER:
case E1000_DEV_ID_82571EB_QUAD_FIBER: case E1000_DEV_ID_82571EB_QUAD_FIBER:
@ -371,7 +370,7 @@ static s32 e1000_get_variants_82571(struct e1000_adapter *adapter)
int is_port_b = er32(STATUS) & E1000_STATUS_FUNC_1; int is_port_b = er32(STATUS) & E1000_STATUS_FUNC_1;
s32 rc; s32 rc;
rc = e1000_init_mac_params_82571(adapter); rc = e1000_init_mac_params_82571(hw);
if (rc) if (rc)
return rc; return rc;

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

@ -553,9 +553,8 @@ static s32 e1000_init_nvm_params_ich8lan(struct e1000_hw *hw)
* Initialize family-specific MAC parameters and function * Initialize family-specific MAC parameters and function
* pointers. * pointers.
**/ **/
static s32 e1000_init_mac_params_ich8lan(struct e1000_adapter *adapter) static s32 e1000_init_mac_params_ich8lan(struct e1000_hw *hw)
{ {
struct e1000_hw *hw = &adapter->hw;
struct e1000_mac_info *mac = &hw->mac; struct e1000_mac_info *mac = &hw->mac;
/* Set media type function pointer */ /* Set media type function pointer */
@ -775,7 +774,7 @@ static s32 e1000_get_variants_ich8lan(struct e1000_adapter *adapter)
struct e1000_hw *hw = &adapter->hw; struct e1000_hw *hw = &adapter->hw;
s32 rc; s32 rc;
rc = e1000_init_mac_params_ich8lan(adapter); rc = e1000_init_mac_params_ich8lan(hw);
if (rc) if (rc)
return rc; return rc;