dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

e1000e: typo corrections 

Here are the other miscellaneous corrections
done by an earlier larger suggested patch now
made unnecessary by a less invasive change.

Correct a few missing newlines from logging
messages and a typo fix.  Fix speed/duplex
logging message.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Joe Perches 2010-03-26 20:16:59 +00:00 committed by David S. Miller
parent c041076a9f
commit 2c73e1fe94
3 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/e1000e/82571.c
View File

@ -323,7 +323,7 @@ static s32 e1000_init_mac_params_82571(struct e1000_adapter *adapter)
}
/*
* Initialze device specific counter of SMBI acquisition
* Initialize device specific counter of SMBI acquisition
* timeouts.
*/
hw->dev_spec.e82571.smb_counter = 0;

6
drivers/net/e1000e/ich8lan.c
View File

@ -1622,7 +1622,7 @@ static s32 e1000_flash_cycle_init_ich8lan(struct e1000_hw *hw)
/* Check if the flash descriptor is valid */
if (hsfsts.hsf_status.fldesvalid == 0) {
e_dbg("Flash descriptor invalid. "
"SW Sequencing must be used.");
"SW Sequencing must be used.\n");
return -E1000_ERR_NVM;
}
@ -1671,7 +1671,7 @@ static s32 e1000_flash_cycle_init_ich8lan(struct e1000_hw *hw)
hsfsts.hsf_status.flcdone = 1;
ew16flash(ICH_FLASH_HSFSTS, hsfsts.regval);
} else {
e_dbg("Flash controller busy, cannot get access");
e_dbg("Flash controller busy, cannot get access\n");
}
}
@ -1822,7 +1822,7 @@ static s32 e1000_read_flash_data_ich8lan(struct e1000_hw *hw, u32 offset,
continue;
} else if (hsfsts.hsf_status.flcdone == 0) {
e_dbg("Timeout error - flash cycle "
"did not complete.");
"did not complete.\n");
break;
}
}

21
drivers/net/e1000e/lib.c
View File

@ -1262,24 +1262,21 @@ s32 e1000e_get_speed_and_duplex_copper(struct e1000_hw *hw, u16 *speed, u16 *dup
u32 status;
status = er32(STATUS);
if (status & E1000_STATUS_SPEED_1000) {
if (status & E1000_STATUS_SPEED_1000)
*speed = SPEED_1000;
e_dbg("1000 Mbs, ");
} else if (status & E1000_STATUS_SPEED_100) {
else if (status & E1000_STATUS_SPEED_100)
*speed = SPEED_100;
e_dbg("100 Mbs, ");
} else {
else
*speed = SPEED_10;
e_dbg("10 Mbs, ");
}
if (status & E1000_STATUS_FD) {
if (status & E1000_STATUS_FD)
*duplex = FULL_DUPLEX;
e_dbg("Full Duplex\n");
} else {
else
*duplex = HALF_DUPLEX;
e_dbg("Half Duplex\n");
}
e_dbg("%u Mbps, %s Duplex\n",
*speed == SPEED_1000 ? 1000 : *speed == SPEED_100 ? 100 : 10,
*duplex == FULL_DUPLEX ? "Full" : "Half");
return 0;
}