Commit 84c1befe authored by Bruce Allan's avatar Bruce Allan Committed by Jeff Kirsher
Browse files

e1000e: cleanup: remove e1000_get_phy_cfg_done() 



Remove the function e1000_get_phy_cfg_done() and replace the single call
to it with the same function pointer that it would call.  The function
pointer is always set so there is no risk of a NULL pointer dereference.

Signed-off-by: default avatarBruce Allan <bruce.w.allan@intel.com>
Tested-by: default avatarAaron Brown <aaron.f.brown@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent fe90849f

drivers/net/ethernet/intel/e1000e/phy.c

+1 −19
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ 


#include "e1000.h"



static s32 e1000_get_phy_cfg_done(struct e1000_hw *hw);

static s32 e1000_wait_autoneg(struct e1000_hw *hw);

static s32 e1000_access_phy_wakeup_reg_bm(struct e1000_hw *hw, u32 offset,

					  u16 *data, bool read, bool page_set);
@@ -2165,7 +2164,7 @@ s32 e1000e_phy_hw_reset_generic(struct e1000_hw *hw) 


	phy->ops.release(hw);



	return e1000_get_phy_cfg_done(hw);

	return phy->ops.get_cfg_done(hw);

}



/**
@@ -2265,23 +2264,6 @@ s32 e1000e_phy_init_script_igp3(struct e1000_hw *hw) 
	return 0;

}



/* Internal function pointers */



/**

 *  e1000_get_phy_cfg_done - Generic PHY configuration done

 *  @hw: pointer to the HW structure

 *

 *  Return success if silicon family did not implement a family specific

 *  get_cfg_done function.

 **/

static s32 e1000_get_phy_cfg_done(struct e1000_hw *hw)

{

	if (hw->phy.ops.get_cfg_done)

		return hw->phy.ops.get_cfg_done(hw);



	return 0;

}



/**

 *  e1000e_get_phy_type_from_id - Get PHY type from id

 *  @phy_id: phy_id read from the phy