diff options
| author | Joe Perches <joe@perches.com> | 2011-03-03 12:55:08 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-03-03 13:02:32 -0800 |
| commit | 967faf3b718e887301adb1636c2295f03d3c694f (patch) | |
| tree | 21bf6963656348aab9887c3954d34c7382c2ed85 | |
| parent | 7542db8b1cb88ab15a85893d1dfb886e22b568e8 (diff) | |
| download | linux-3.10-967faf3b718e887301adb1636c2295f03d3c694f.tar.gz linux-3.10-967faf3b718e887301adb1636c2295f03d3c694f.tar.bz2 linux-3.10-967faf3b718e887301adb1636c2295f03d3c694f.zip | |
mii: Convert printks to netdev_info
Add a bit more data to the output.
Convert string speeds to integer.
Object size reduced a tiny bit.
$ size drivers/net/mii.o*
text data bss dec hex filename
4155 56 1000 5211 145b drivers/net/mii.o.new
4184 56 1000 5240 1478 drivers/net/mii.o.old
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/mii.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/net/mii.c b/drivers/net/mii.c index 210b2b164b3..0a6c6a2e755 100644 --- a/drivers/net/mii.c +++ b/drivers/net/mii.c @@ -354,7 +354,7 @@ unsigned int mii_check_media (struct mii_if_info *mii, if (!new_carrier) { netif_carrier_off(mii->dev); if (ok_to_print) - printk(KERN_INFO "%s: link down\n", mii->dev->name); + netdev_info(mii->dev, "link down\n"); return 0; /* duplex did not change */ } @@ -381,12 +381,12 @@ unsigned int mii_check_media (struct mii_if_info *mii, duplex = 1; if (ok_to_print) - printk(KERN_INFO "%s: link up, %sMbps, %s-duplex, lpa 0x%04X\n", - mii->dev->name, - lpa2 & (LPA_1000FULL | LPA_1000HALF) ? "1000" : - media & (ADVERTISE_100FULL | ADVERTISE_100HALF) ? "100" : "10", - duplex ? "full" : "half", - lpa); + netdev_info(mii->dev, "link up, %uMbps, %s-duplex, lpa 0x%04X\n", + lpa2 & (LPA_1000FULL | LPA_1000HALF) ? 1000 : + media & (ADVERTISE_100FULL | ADVERTISE_100HALF) ? + 100 : 10, + duplex ? "full" : "half", + lpa); if ((init_media) || (mii->full_duplex != duplex)) { mii->full_duplex = duplex; |