From: Don Skidmore Date: Fri, 12 Dec 2014 05:37:30 +0000 (+0000) Subject: ixgbe: Cleanup probe to remove redundant attempt to ID PHY X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=4dedadcbae35c84366c2543bce37e045b1665196;p=linux-beck.git 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 Tested-by: Phil Schmitt Signed-off-by: Jeff Kirsher --- 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) { 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;