diff options
| author | Don Skidmore <donald.c.skidmore@intel.com> | 2014-12-12 00:37:30 -0500 |
|---|---|---|
| committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2015-02-05 22:57:48 -0500 |
| commit | 4dedadcbae35c84366c2543bce37e045b1665196 (patch) | |
| tree | 7a96a9c361776d42783e1a512ab38f3eb86c2727 | |
| parent | f9c9e488ce1e521ef1bf9f7b72a01c861475fcd3 (diff) | |
ixgbe: Cleanup probe to remove redundant attempt to ID PHY
We always identify the PHY in our reset_hw path anyway so there is
no need to do it in get_invariants(). The reason I even noticed this
is that for new hardware (X550em) we don't assign some methods until
later in probe and calling phy.ops.read_reg could lead to a panic.
Signed-off-by: Don Skidmore <donald.c.skidmore@intel.com>
Tested-by: Phil Schmitt <phillip.j.schmitt@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
| -rw-r--r-- | drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c index ba54ff07b438..49395420c9b3 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c | |||
| @@ -55,9 +55,6 @@ s32 ixgbe_get_invariants_X540(struct ixgbe_hw *hw) | |||
| 55 | { | 55 | { |
| 56 | struct ixgbe_mac_info *mac = &hw->mac; | 56 | struct ixgbe_mac_info *mac = &hw->mac; |
| 57 | 57 | ||
| 58 | /* Call PHY identify routine to get the phy type */ | ||
| 59 | ixgbe_identify_phy_generic(hw); | ||
| 60 | |||
| 61 | mac->mcft_size = IXGBE_X540_MC_TBL_SIZE; | 58 | mac->mcft_size = IXGBE_X540_MC_TBL_SIZE; |
| 62 | mac->vft_size = IXGBE_X540_VFT_TBL_SIZE; | 59 | mac->vft_size = IXGBE_X540_VFT_TBL_SIZE; |
| 63 | mac->num_rar_entries = IXGBE_X540_RAR_ENTRIES; | 60 | mac->num_rar_entries = IXGBE_X540_RAR_ENTRIES; |
