aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/e1000e/phy.c
diff options
context:
space:
mode:
authorBruce Allan <bruce.w.allan@intel.com>2009-12-01 10:51:11 -0500
committerDavid S. Miller <davem@davemloft.net>2009-12-02 03:35:54 -0500
commit5ff5b664351a94754031c1e5783f0cea6b3000ed (patch)
tree09ff7ddacd94175b78879548179f108c1593efc1 /drivers/net/e1000e/phy.c
parent9e135a2e6266eba276f33c404a2478499bc07ff5 (diff)
e1000e: comment corrections
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>
Diffstat (limited to 'drivers/net/e1000e/phy.c')
-rw-r--r--drivers/net/e1000e/phy.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/net/e1000e/phy.c b/drivers/net/e1000e/phy.c
index 140b23b320fd..1bc09b240e62 100644
--- a/drivers/net/e1000e/phy.c
+++ b/drivers/net/e1000e/phy.c
@@ -153,10 +153,10 @@ s32 e1000e_get_phy_id(struct e1000_hw *hw)
153 goto out; 153 goto out;
154 154
155 /* 155 /*
156 * If the PHY ID is still unknown, we may have an 82577i 156 * If the PHY ID is still unknown, we may have an 82577
157 * without link. We will try again after setting Slow 157 * without link. We will try again after setting Slow MDIC
158 * MDIC mode. No harm in trying again in this case since 158 * mode. No harm in trying again in this case since the PHY
159 * the PHY ID is unknown at this point anyway 159 * ID is unknown at this point anyway.
160 */ 160 */
161 ret_val = phy->ops.acquire(hw); 161 ret_val = phy->ops.acquire(hw);
162 if (ret_val) 162 if (ret_val)
@@ -1744,7 +1744,7 @@ out:
1744 * The automatic gain control (agc) normalizes the amplitude of the 1744 * The automatic gain control (agc) normalizes the amplitude of the
1745 * received signal, adjusting for the attenuation produced by the 1745 * received signal, adjusting for the attenuation produced by the
1746 * cable. By reading the AGC registers, which represent the 1746 * cable. By reading the AGC registers, which represent the
1747 * combination of course and fine gain value, the value can be put 1747 * combination of coarse and fine gain value, the value can be put
1748 * into a lookup table to obtain the approximate cable length 1748 * into a lookup table to obtain the approximate cable length
1749 * for each channel. 1749 * for each channel.
1750 **/ 1750 **/
@@ -1769,7 +1769,7 @@ s32 e1000e_get_cable_length_igp_2(struct e1000_hw *hw)
1769 1769
1770 /* 1770 /*
1771 * Getting bits 15:9, which represent the combination of 1771 * Getting bits 15:9, which represent the combination of
1772 * course and fine gain values. The result is a number 1772 * coarse and fine gain values. The result is a number
1773 * that can be put into the lookup table to obtain the 1773 * that can be put into the lookup table to obtain the
1774 * approximate cable length. 1774 * approximate cable length.
1775 */ 1775 */
@@ -2511,7 +2511,7 @@ static s32 e1000_access_phy_wakeup_reg_bm(struct e1000_hw *hw, u32 offset,
2511 ret_val = e1000e_read_phy_reg_mdic(hw, BM_WUC_DATA_OPCODE, 2511 ret_val = e1000e_read_phy_reg_mdic(hw, BM_WUC_DATA_OPCODE,
2512 data); 2512 data);
2513 } else { 2513 } else {
2514 /* Read the page 800 value using opcode 0x12 */ 2514 /* Write the page 800 value using opcode 0x12 */
2515 ret_val = e1000e_write_phy_reg_mdic(hw, BM_WUC_DATA_OPCODE, 2515 ret_val = e1000e_write_phy_reg_mdic(hw, BM_WUC_DATA_OPCODE,
2516 *data); 2516 *data);
2517 } 2517 }