e1000e: cleanup ops function pointers

The phy and nvm operations structures have function pointers that contain
"phy" and "nvm" in the pointer names which are redundant since the
structures are already obviously in phy and nvm structures.

Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/net/e1000e/lib.c b/drivers/net/e1000e/lib.c
index fa31c51e5642..f664fc03aa2b 100644
--- a/drivers/net/e1000e/lib.c
+++ b/drivers/net/e1000e/lib.c
@@ -1985,7 +1985,7 @@ s32 e1000e_write_nvm_spi(struct e1000_hw *hw, u16 offset, u16 words, u16 *data)
                 return -E1000_ERR_NVM;
         }
 
-        ret_val = nvm->ops.acquire_nvm(hw);
+        ret_val = nvm->ops.acquire(hw);
         if (ret_val)
                 return ret_val;
 
@@ -1996,7 +1996,7 @@ s32 e1000e_write_nvm_spi(struct e1000_hw *hw, u16 offset, u16 words, u16 *data)
 
                 ret_val = e1000_ready_nvm_eeprom(hw);
                 if (ret_val) {
-                        nvm->ops.release_nvm(hw);
+                        nvm->ops.release(hw);
                         return ret_val;
                 }
 
@@ -2035,7 +2035,7 @@ s32 e1000e_write_nvm_spi(struct e1000_hw *hw, u16 offset, u16 words, u16 *data)
         }
 
         msleep(10);
-        nvm->ops.release_nvm(hw);
+        nvm->ops.release(hw);
         return 0;
 }