diff options
author | Bruce Allan <bruce.w.allan@intel.com> | 2012-02-01 05:53:05 -0500 |
---|---|---|
committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2012-02-10 03:07:12 -0500 |
commit | ec34c170da8798f521f0d40cad54580ff93cea3a (patch) | |
tree | adb3391a27061fc79764d00d726079c4331fc74c | |
parent | 07914ee3ccbf93ce688f1aaba15d8b01f19c5d77 (diff) |
e1000e: pass pointer to hw struct for e1000_init_mac_params_XXX()
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>
-rw-r--r-- | drivers/net/ethernet/intel/e1000e/80003es2lan.c | 7 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/e1000e/82571.c | 7 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/e1000e/ich8lan.c | 5 |
3 files changed, 8 insertions, 11 deletions
diff --git a/drivers/net/ethernet/intel/e1000e/80003es2lan.c b/drivers/net/ethernet/intel/e1000e/80003es2lan.c index 9b969615b72a..cfb361e5f498 100644 --- a/drivers/net/ethernet/intel/e1000e/80003es2lan.c +++ b/drivers/net/ethernet/intel/e1000e/80003es2lan.c | |||
@@ -201,13 +201,12 @@ static s32 e1000_init_nvm_params_80003es2lan(struct e1000_hw *hw) | |||
201 | * e1000_init_mac_params_80003es2lan - Init ESB2 MAC func ptrs. | 201 | * e1000_init_mac_params_80003es2lan - Init ESB2 MAC func ptrs. |
202 | * @hw: pointer to the HW structure | 202 | * @hw: pointer to the HW structure |
203 | **/ | 203 | **/ |
204 | static s32 e1000_init_mac_params_80003es2lan(struct e1000_adapter *adapter) | 204 | static s32 e1000_init_mac_params_80003es2lan(struct e1000_hw *hw) |
205 | { | 205 | { |
206 | struct e1000_hw *hw = &adapter->hw; | ||
207 | struct e1000_mac_info *mac = &hw->mac; | 206 | struct e1000_mac_info *mac = &hw->mac; |
208 | 207 | ||
209 | /* Set media type and media-dependent function pointers */ | 208 | /* Set media type and media-dependent function pointers */ |
210 | switch (adapter->pdev->device) { | 209 | switch (hw->adapter->pdev->device) { |
211 | case E1000_DEV_ID_80003ES2LAN_SERDES_DPT: | 210 | case E1000_DEV_ID_80003ES2LAN_SERDES_DPT: |
212 | hw->phy.media_type = e1000_media_type_internal_serdes; | 211 | hw->phy.media_type = e1000_media_type_internal_serdes; |
213 | mac->ops.check_for_link = e1000e_check_for_serdes_link; | 212 | mac->ops.check_for_link = e1000e_check_for_serdes_link; |
@@ -246,7 +245,7 @@ static s32 e1000_get_variants_80003es2lan(struct e1000_adapter *adapter) | |||
246 | struct e1000_hw *hw = &adapter->hw; | 245 | struct e1000_hw *hw = &adapter->hw; |
247 | s32 rc; | 246 | s32 rc; |
248 | 247 | ||
249 | rc = e1000_init_mac_params_80003es2lan(adapter); | 248 | rc = e1000_init_mac_params_80003es2lan(hw); |
250 | if (rc) | 249 | if (rc) |
251 | return rc; | 250 | return rc; |
252 | 251 | ||
diff --git a/drivers/net/ethernet/intel/e1000e/82571.c b/drivers/net/ethernet/intel/e1000e/82571.c index 7ef4711a32b8..795c3d640615 100644 --- a/drivers/net/ethernet/intel/e1000e/82571.c +++ b/drivers/net/ethernet/intel/e1000e/82571.c | |||
@@ -235,16 +235,15 @@ static s32 e1000_init_nvm_params_82571(struct e1000_hw *hw) | |||
235 | * e1000_init_mac_params_82571 - Init MAC func ptrs. | 235 | * e1000_init_mac_params_82571 - Init MAC func ptrs. |
236 | * @hw: pointer to the HW structure | 236 | * @hw: pointer to the HW structure |
237 | **/ | 237 | **/ |
238 | static s32 e1000_init_mac_params_82571(struct e1000_adapter *adapter) | 238 | static s32 e1000_init_mac_params_82571(struct e1000_hw *hw) |
239 | { | 239 | { |
240 | struct e1000_hw *hw = &adapter->hw; | ||
241 | struct e1000_mac_info *mac = &hw->mac; | 240 | struct e1000_mac_info *mac = &hw->mac; |
242 | u32 swsm = 0; | 241 | u32 swsm = 0; |
243 | u32 swsm2 = 0; | 242 | u32 swsm2 = 0; |
244 | bool force_clear_smbi = false; | 243 | bool force_clear_smbi = false; |
245 | 244 | ||
246 | /* Set media type and media-dependent function pointers */ | 245 | /* Set media type and media-dependent function pointers */ |
247 | switch (adapter->pdev->device) { | 246 | switch (hw->adapter->pdev->device) { |
248 | case E1000_DEV_ID_82571EB_FIBER: | 247 | case E1000_DEV_ID_82571EB_FIBER: |
249 | case E1000_DEV_ID_82572EI_FIBER: | 248 | case E1000_DEV_ID_82572EI_FIBER: |
250 | case E1000_DEV_ID_82571EB_QUAD_FIBER: | 249 | case E1000_DEV_ID_82571EB_QUAD_FIBER: |
@@ -371,7 +370,7 @@ static s32 e1000_get_variants_82571(struct e1000_adapter *adapter) | |||
371 | int is_port_b = er32(STATUS) & E1000_STATUS_FUNC_1; | 370 | int is_port_b = er32(STATUS) & E1000_STATUS_FUNC_1; |
372 | s32 rc; | 371 | s32 rc; |
373 | 372 | ||
374 | rc = e1000_init_mac_params_82571(adapter); | 373 | rc = e1000_init_mac_params_82571(hw); |
375 | if (rc) | 374 | if (rc) |
376 | return rc; | 375 | return rc; |
377 | 376 | ||
diff --git a/drivers/net/ethernet/intel/e1000e/ich8lan.c b/drivers/net/ethernet/intel/e1000e/ich8lan.c index 942f4da86fb8..112d55f76b79 100644 --- a/drivers/net/ethernet/intel/e1000e/ich8lan.c +++ b/drivers/net/ethernet/intel/e1000e/ich8lan.c | |||
@@ -553,9 +553,8 @@ static s32 e1000_init_nvm_params_ich8lan(struct e1000_hw *hw) | |||
553 | * Initialize family-specific MAC parameters and function | 553 | * Initialize family-specific MAC parameters and function |
554 | * pointers. | 554 | * pointers. |
555 | **/ | 555 | **/ |
556 | static s32 e1000_init_mac_params_ich8lan(struct e1000_adapter *adapter) | 556 | static s32 e1000_init_mac_params_ich8lan(struct e1000_hw *hw) |
557 | { | 557 | { |
558 | struct e1000_hw *hw = &adapter->hw; | ||
559 | struct e1000_mac_info *mac = &hw->mac; | 558 | struct e1000_mac_info *mac = &hw->mac; |
560 | 559 | ||
561 | /* Set media type function pointer */ | 560 | /* Set media type function pointer */ |
@@ -775,7 +774,7 @@ static s32 e1000_get_variants_ich8lan(struct e1000_adapter *adapter) | |||
775 | struct e1000_hw *hw = &adapter->hw; | 774 | struct e1000_hw *hw = &adapter->hw; |
776 | s32 rc; | 775 | s32 rc; |
777 | 776 | ||
778 | rc = e1000_init_mac_params_ich8lan(adapter); | 777 | rc = e1000_init_mac_params_ich8lan(hw); |
779 | if (rc) | 778 | if (rc) |
780 | return rc; | 779 | return rc; |
781 | 780 | ||