diff options
author | Bruce Allan <bruce.w.allan@intel.com> | 2009-12-01 10:51:11 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-12-02 03:35:54 -0500 |
commit | 5ff5b664351a94754031c1e5783f0cea6b3000ed (patch) | |
tree | 09ff7ddacd94175b78879548179f108c1593efc1 /drivers/net/e1000e/ich8lan.c | |
parent | 9e135a2e6266eba276f33c404a2478499bc07ff5 (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/ich8lan.c')
-rw-r--r-- | drivers/net/e1000e/ich8lan.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/e1000e/ich8lan.c b/drivers/net/e1000e/ich8lan.c index fbbc6ddfde80..1ce2bf97fa37 100644 --- a/drivers/net/e1000e/ich8lan.c +++ b/drivers/net/e1000e/ich8lan.c | |||
@@ -1747,7 +1747,7 @@ static s32 e1000_flash_cycle_init_ich8lan(struct e1000_hw *hw) | |||
1747 | if (hsfsts.hsf_status.flcinprog == 0) { | 1747 | if (hsfsts.hsf_status.flcinprog == 0) { |
1748 | /* | 1748 | /* |
1749 | * There is no cycle running at present, | 1749 | * There is no cycle running at present, |
1750 | * so we can start a cycle | 1750 | * so we can start a cycle. |
1751 | * Begin by setting Flash Cycle Done. | 1751 | * Begin by setting Flash Cycle Done. |
1752 | */ | 1752 | */ |
1753 | hsfsts.hsf_status.flcdone = 1; | 1753 | hsfsts.hsf_status.flcdone = 1; |
@@ -1755,7 +1755,7 @@ static s32 e1000_flash_cycle_init_ich8lan(struct e1000_hw *hw) | |||
1755 | ret_val = 0; | 1755 | ret_val = 0; |
1756 | } else { | 1756 | } else { |
1757 | /* | 1757 | /* |
1758 | * otherwise poll for sometime so the current | 1758 | * Otherwise poll for sometime so the current |
1759 | * cycle has a chance to end before giving up. | 1759 | * cycle has a chance to end before giving up. |
1760 | */ | 1760 | */ |
1761 | for (i = 0; i < ICH_FLASH_READ_COMMAND_TIMEOUT; i++) { | 1761 | for (i = 0; i < ICH_FLASH_READ_COMMAND_TIMEOUT; i++) { |
@@ -2645,7 +2645,6 @@ static s32 e1000_reset_hw_ich8lan(struct e1000_hw *hw) | |||
2645 | ctrl |= E1000_CTRL_PHY_RST; | 2645 | ctrl |= E1000_CTRL_PHY_RST; |
2646 | } | 2646 | } |
2647 | ret_val = e1000_acquire_swflag_ich8lan(hw); | 2647 | ret_val = e1000_acquire_swflag_ich8lan(hw); |
2648 | /* Whether or not the swflag was acquired, we need to reset the part */ | ||
2649 | e_dbg("Issuing a global reset to ich8lan\n"); | 2648 | e_dbg("Issuing a global reset to ich8lan\n"); |
2650 | ew32(CTRL, (ctrl | E1000_CTRL_RST)); | 2649 | ew32(CTRL, (ctrl | E1000_CTRL_RST)); |
2651 | msleep(20); | 2650 | msleep(20); |