diff options
| author | Bruce Allan <bruce.w.allan@intel.com> | 2013-01-23 06:50:05 +0000 |
|---|---|---|
| committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2013-01-27 22:35:46 -0800 |
| commit | 6b598e1eac68b07ebb831258e0667f5ba2834822 (patch) | |
| tree | 333965677d54f113bcc2ccc144e903e8302e4885 /drivers/net/ethernet/intel/e1000e/e1000.h | |
| parent | dde3a5745cd27167653feb2e7e9fa0e3631e91ce (diff) | |
| download | linux-6b598e1eac68b07ebb831258e0667f5ba2834822.tar.gz linux-6b598e1eac68b07ebb831258e0667f5ba2834822.tar.bz2 linux-6b598e1eac68b07ebb831258e0667f5ba2834822.zip | |
e1000e: cleanup: remove e1000e_commit_phy()
Remove the function e1000e_commit_phy() and replace the few calls to it
with the same function pointer that it would call. The function pointer is
almost always set for the devices that access these code paths so there is
no risk of a NULL pointer dereference; for the few instances where the
function pointer might not be set (i.e. can be called for the few devices
which do not have this function pointer set), check for a valid function
pointer.
Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Tested-by: Jeff Pieper <jeffrey.e.pieper@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net/ethernet/intel/e1000e/e1000.h')
| -rw-r--r-- | drivers/net/ethernet/intel/e1000e/e1000.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/ethernet/intel/e1000e/e1000.h b/drivers/net/ethernet/intel/e1000e/e1000.h index 896eacc80433..4ffb62bd0b75 100644 --- a/drivers/net/ethernet/intel/e1000e/e1000.h +++ b/drivers/net/ethernet/intel/e1000e/e1000.h @@ -579,8 +579,6 @@ extern const struct e1000_info e1000_es2_info; extern s32 e1000_read_pba_string_generic(struct e1000_hw *hw, u8 *pba_num, u32 pba_num_size); -extern s32 e1000e_commit_phy(struct e1000_hw *hw); - extern bool e1000e_enable_mng_pass_thru(struct e1000_hw *hw); extern bool e1000e_get_laa_state_82571(struct e1000_hw *hw); |