lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

e1000e: cleanup: remove e1000_force_speed_duplex()

Browse Source 
Remove the function e1000_force_speed_duplex() 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: 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>
This commit is contained in:
Bruce Allan
2013-01-05 08:06:08 +00:00
committed by Jeff Kirsher
parent 7de89f058e
commit c2c6629ba3
1 changed files with 1 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/net/ethernet/intel/e1000e/phy.c
View File

@@ -29,7 +29,6 @@
#include "e1000.h" #include "e1000.h"
static s32 e1000_get_phy_cfg_done(struct e1000_hw *hw); static s32 e1000_get_phy_cfg_done(struct e1000_hw *hw);
static s32 e1000_phy_force_speed_duplex(struct e1000_hw *hw);
static s32 e1000_wait_autoneg(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, static s32 e1000_access_phy_wakeup_reg_bm(struct e1000_hw *hw, u32 offset,
u16 *data, bool read, bool page_set); u16 *data, bool read, bool page_set);
@@ -1196,7 +1195,7 @@ s32 e1000e_setup_copper_link(struct e1000_hw *hw)
* depending on user settings. * depending on user settings.
*/ */
e_dbg("Forcing Speed and Duplex\n"); e_dbg("Forcing Speed and Duplex\n");
ret_val = e1000_phy_force_speed_duplex(hw); ret_val = hw->phy.ops.force_speed_duplex(hw);
if (ret_val) { if (ret_val) {
e_dbg("Error Forcing Speed and Duplex\n"); e_dbg("Error Forcing Speed and Duplex\n");
return ret_val; return ret_val;
@@ -2283,21 +2282,6 @@ static s32 e1000_get_phy_cfg_done(struct e1000_hw *hw)
return 0; return 0;
} }
/**
* e1000_phy_force_speed_duplex - Generic force PHY speed/duplex
* @hw: pointer to the HW structure
*
* When the silicon family has not implemented a forced speed/duplex
* function for the PHY, simply return 0.
**/
static s32 e1000_phy_force_speed_duplex(struct e1000_hw *hw)
{
if (hw->phy.ops.force_speed_duplex)
return hw->phy.ops.force_speed_duplex(hw);
return 0;
}
/** /**
* e1000e_get_phy_type_from_id - Get PHY type from id * e1000e_get_phy_type_from_id - Get PHY type from id
* @phy_id: phy_id read from the phy * @phy_id: phy_id read from the phy