diff options
author | Joe Perches <joe@perches.com> | 2010-03-26 16:16:59 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-03-31 02:02:27 -0400 |
commit | 2c73e1fe94b1962ae5df7618519c18526e9d9072 (patch) | |
tree | 4997c483a1a3c50a3afc92c093324e74a8859a2d /drivers/net/e1000e/lib.c | |
parent | c041076a9f79a7cf28e808f73cc76f24cbf97093 (diff) |
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>
Diffstat (limited to 'drivers/net/e1000e/lib.c')
-rw-r--r-- | drivers/net/e1000e/lib.c | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/drivers/net/e1000e/lib.c b/drivers/net/e1000e/lib.c index a8b2c0de27c4..b0d2a60aa490 100644 --- a/drivers/net/e1000e/lib.c +++ b/drivers/net/e1000e/lib.c | |||
@@ -1262,24 +1262,21 @@ s32 e1000e_get_speed_and_duplex_copper(struct e1000_hw *hw, u16 *speed, u16 *dup | |||
1262 | u32 status; | 1262 | u32 status; |
1263 | 1263 | ||
1264 | status = er32(STATUS); | 1264 | status = er32(STATUS); |
1265 | if (status & E1000_STATUS_SPEED_1000) { | 1265 | if (status & E1000_STATUS_SPEED_1000) |
1266 | *speed = SPEED_1000; | 1266 | *speed = SPEED_1000; |
1267 | e_dbg("1000 Mbs, "); | 1267 | else if (status & E1000_STATUS_SPEED_100) |
1268 | } else if (status & E1000_STATUS_SPEED_100) { | ||
1269 | *speed = SPEED_100; | 1268 | *speed = SPEED_100; |
1270 | e_dbg("100 Mbs, "); | 1269 | else |
1271 | } else { | ||
1272 | *speed = SPEED_10; | 1270 | *speed = SPEED_10; |
1273 | e_dbg("10 Mbs, "); | ||
1274 | } | ||
1275 | 1271 | ||
1276 | if (status & E1000_STATUS_FD) { | 1272 | if (status & E1000_STATUS_FD) |
1277 | *duplex = FULL_DUPLEX; | 1273 | *duplex = FULL_DUPLEX; |
1278 | e_dbg("Full Duplex\n"); | 1274 | else |
1279 | } else { | ||
1280 | *duplex = HALF_DUPLEX; | 1275 | *duplex = HALF_DUPLEX; |
1281 | e_dbg("Half Duplex\n"); | 1276 | |
1282 | } | 1277 | e_dbg("%u Mbps, %s Duplex\n", |
1278 | *speed == SPEED_1000 ? 1000 : *speed == SPEED_100 ? 100 : 10, | ||
1279 | *duplex == FULL_DUPLEX ? "Full" : "Half"); | ||
1283 | 1280 | ||
1284 | return 0; | 1281 | return 0; |
1285 | } | 1282 | } |