Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4dedadcb authored by Don Skidmore's avatar Don Skidmore Committed by Jeff Kirsher
Browse files

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: default avatarDon Skidmore <donald.c.skidmore@intel.com>
Tested-by: default avatarPhil Schmitt <phillip.j.schmitt@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent f9c9e488

drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c

+0 −3
Original line number Diff line number Diff line
@@ -55,9 +55,6 @@ s32 ixgbe_get_invariants_X540(struct ixgbe_hw *hw) 
{

	struct ixgbe_mac_info *mac = &hw->mac;



	/* Call PHY identify routine to get the phy type */

	ixgbe_identify_phy_generic(hw);



	mac->mcft_size = IXGBE_X540_MC_TBL_SIZE;

	mac->vft_size = IXGBE_X540_VFT_TBL_SIZE;

	mac->num_rar_entries = IXGBE_X540_RAR_ENTRIES;