diff options
author | Alexander Duyck <alexander.h.duyck@intel.com> | 2009-02-06 18:17:26 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-02-07 05:43:05 -0500 |
commit | a8d2a0c27f84bdbf54b7e1c1a52ef7b8b7196dbc (patch) | |
tree | 0c1a666348dd94797740a0788a025764a303f54e /drivers/net/igb/e1000_mac.c | |
parent | 40a70b3889ea50daa10a7f3468920c1f5483155d (diff) |
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>
Diffstat (limited to 'drivers/net/igb/e1000_mac.c')
-rw-r--r-- | drivers/net/igb/e1000_mac.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/igb/e1000_mac.c b/drivers/net/igb/e1000_mac.c index 16fa0833368c..d0b695cf956c 100644 --- a/drivers/net/igb/e1000_mac.c +++ b/drivers/net/igb/e1000_mac.c | |||
@@ -707,11 +707,11 @@ s32 igb_config_fc_after_link_up(struct e1000_hw *hw) | |||
707 | * has completed. We read this twice because this reg has | 707 | * has completed. We read this twice because this reg has |
708 | * some "sticky" (latched) bits. | 708 | * some "sticky" (latched) bits. |
709 | */ | 709 | */ |
710 | ret_val = hw->phy.ops.read_phy_reg(hw, PHY_STATUS, | 710 | ret_val = hw->phy.ops.read_reg(hw, PHY_STATUS, |
711 | &mii_status_reg); | 711 | &mii_status_reg); |
712 | if (ret_val) | 712 | if (ret_val) |
713 | goto out; | 713 | goto out; |
714 | ret_val = hw->phy.ops.read_phy_reg(hw, PHY_STATUS, | 714 | ret_val = hw->phy.ops.read_reg(hw, PHY_STATUS, |
715 | &mii_status_reg); | 715 | &mii_status_reg); |
716 | if (ret_val) | 716 | if (ret_val) |
717 | goto out; | 717 | goto out; |
@@ -729,11 +729,11 @@ s32 igb_config_fc_after_link_up(struct e1000_hw *hw) | |||
729 | * Page Ability Register (Address 5) to determine how | 729 | * Page Ability Register (Address 5) to determine how |
730 | * flow control was negotiated. | 730 | * flow control was negotiated. |
731 | */ | 731 | */ |
732 | ret_val = hw->phy.ops.read_phy_reg(hw, PHY_AUTONEG_ADV, | 732 | ret_val = hw->phy.ops.read_reg(hw, PHY_AUTONEG_ADV, |
733 | &mii_nway_adv_reg); | 733 | &mii_nway_adv_reg); |
734 | if (ret_val) | 734 | if (ret_val) |
735 | goto out; | 735 | goto out; |
736 | ret_val = hw->phy.ops.read_phy_reg(hw, PHY_LP_ABILITY, | 736 | ret_val = hw->phy.ops.read_reg(hw, PHY_LP_ABILITY, |
737 | &mii_nway_lp_ability_reg); | 737 | &mii_nway_lp_ability_reg); |
738 | if (ret_val) | 738 | if (ret_val) |
739 | goto out; | 739 | goto out; |