Skip to content

Commit

Permalink
e1000e: cleanup e1000_init_mac_params_80003es2lan()
Browse files Browse the repository at this point in the history
Combine two switch statements into one, convert a nebulous pointer to one
that is a bit more in keeping with the rest of the driver code and remove
some dead code (there are no 80003es2lan devices with fiber).  No change in
functionality, just cosmetic changes.

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>
  • Loading branch information
Bruce Allan authored and Jeff Kirsher committed Feb 7, 2012
1 parent 9e2d765 commit e68782e
Showing 1 changed file with 7 additions and 21 deletions.
28 changes: 7 additions & 21 deletions drivers/net/ethernet/intel/e1000e/80003es2lan.c
Original file line number Diff line number Diff line change
Expand Up @@ -205,15 +205,20 @@ static s32 e1000_init_mac_params_80003es2lan(struct e1000_adapter *adapter)
{
struct e1000_hw *hw = &adapter->hw;
struct e1000_mac_info *mac = &hw->mac;
struct e1000_mac_operations *func = &mac->ops;

/* Set media type */
/* Set media type and media-dependent function pointers */
switch (adapter->pdev->device) {
case E1000_DEV_ID_80003ES2LAN_SERDES_DPT:
hw->phy.media_type = e1000_media_type_internal_serdes;
mac->ops.check_for_link = e1000e_check_for_serdes_link;
mac->ops.setup_physical_interface =
e1000e_setup_fiber_serdes_link;
break;
default:
hw->phy.media_type = e1000_media_type_copper;
mac->ops.check_for_link = e1000e_check_for_copper_link;
mac->ops.setup_physical_interface =
e1000_setup_copper_link_80003es2lan;
break;
}

Expand All @@ -230,25 +235,6 @@ static s32 e1000_init_mac_params_80003es2lan(struct e1000_adapter *adapter)
/* Adaptive IFS not supported */
mac->adaptive_ifs = false;

/* check for link */
switch (hw->phy.media_type) {
case e1000_media_type_copper:
func->setup_physical_interface = e1000_setup_copper_link_80003es2lan;
func->check_for_link = e1000e_check_for_copper_link;
break;
case e1000_media_type_fiber:
func->setup_physical_interface = e1000e_setup_fiber_serdes_link;
func->check_for_link = e1000e_check_for_fiber_link;
break;
case e1000_media_type_internal_serdes:
func->setup_physical_interface = e1000e_setup_fiber_serdes_link;
func->check_for_link = e1000e_check_for_serdes_link;
break;
default:
return -E1000_ERR_CONFIG;
break;
}

/* set lan id for port to determine which phy lock to use */
hw->mac.ops.set_lan_id(hw);

Expand Down

0 comments on commit e68782e

Please sign in to comment.