diff options
| author | Bruce Allan <bruce.w.allan@intel.com> | 2012-02-22 09:02:37 +0000 |
|---|---|---|
| committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2012-02-24 21:36:53 -0800 |
| commit | 44abd5c12767a8c567dc4e45fd9aec3b13ca85e0 (patch) | |
| tree | 0fa14af642b5f9ab42b6e1127d9699036289a458 /drivers/net/ethernet/intel/e1000e/phy.c | |
| parent | 48768329efcf5e3970f54f6d15046f3e549101d8 (diff) | |
| download | olio-linux-3.10-44abd5c12767a8c567dc4e45fd9aec3b13ca85e0.tar.xz olio-linux-3.10-44abd5c12767a8c567dc4e45fd9aec3b13ca85e0.zip | |
e1000e: cleanup use of check_reset_block function pointer
Replace e1000_check_reset_block() inline function with calls to the PHY ops
check_reset_block function pointer.
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>
Diffstat (limited to 'drivers/net/ethernet/intel/e1000e/phy.c')
| -rw-r--r-- | drivers/net/ethernet/intel/e1000e/phy.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/intel/e1000e/phy.c b/drivers/net/ethernet/intel/e1000e/phy.c index d4dbbe74124..d10b27fee20 100644 --- a/drivers/net/ethernet/intel/e1000e/phy.c +++ b/drivers/net/ethernet/intel/e1000e/phy.c @@ -2133,7 +2133,7 @@ s32 e1000e_phy_hw_reset_generic(struct e1000_hw *hw) s32 ret_val; u32 ctrl; - ret_val = e1000_check_reset_block(hw); + ret_val = phy->ops.check_reset_block(hw); if (ret_val) return 0; |