igb: rename phy ops

This patch renames write_phy_reg to write_reg and read_phy_reg to read_reg.
It seems redundant to call out phy in an operation that is part of the
phy_ops struct.

Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 6 insertions, 6 deletions

diff --git a/drivers/net/igb/igb.h b/drivers/net/igb/igb.h
index 530d7aa4cb86..a2a812deb6b8 100644
--- a/drivers/net/igb/igb.h
+++ b/drivers/net/igb/igb.h
@@ -313,24 +313,24 @@ extern void igb_set_ethtool_ops(struct net_device *);
 
 static inline s32 igb_reset_phy(struct e1000_hw *hw)
 {
-        if (hw->phy.ops.reset_phy)
-                return hw->phy.ops.reset_phy(hw);
+        if (hw->phy.ops.reset)
+                return hw->phy.ops.reset(hw);
 
         return 0;
 }
 
 static inline s32 igb_read_phy_reg(struct e1000_hw *hw, u32 offset, u16 *data)
 {
-        if (hw->phy.ops.read_phy_reg)
-                return hw->phy.ops.read_phy_reg(hw, offset, data);
+        if (hw->phy.ops.read_reg)
+                return hw->phy.ops.read_reg(hw, offset, data);
 
         return 0;
 }
 
 static inline s32 igb_write_phy_reg(struct e1000_hw *hw, u32 offset, u16 data)
 {
-        if (hw->phy.ops.write_phy_reg)
-                return hw->phy.ops.write_phy_reg(hw, offset, data);
+        if (hw->phy.ops.write_reg)
+                return hw->phy.ops.write_reg(hw, offset, data);
 
         return 0;
 }