Skip to content

Commit 967faf3

Browse files
JoePerchesdavem330
authored andcommitted
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 <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 7542db8 commit 967faf3

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

drivers/net/mii.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,7 @@ unsigned int mii_check_media (struct mii_if_info *mii,
354354
if (!new_carrier) {
355355
netif_carrier_off(mii->dev);
356356
if (ok_to_print)
357-
printk(KERN_INFO "%s: link down\n", mii->dev->name);
357+
netdev_info(mii->dev, "link down\n");
358358
return 0; /* duplex did not change */
359359
}
360360

@@ -381,12 +381,12 @@ unsigned int mii_check_media (struct mii_if_info *mii,
381381
duplex = 1;
382382

383383
if (ok_to_print)
384-
printk(KERN_INFO "%s: link up, %sMbps, %s-duplex, lpa 0x%04X\n",
385-
mii->dev->name,
386-
lpa2 & (LPA_1000FULL | LPA_1000HALF) ? "1000" :
387-
media & (ADVERTISE_100FULL | ADVERTISE_100HALF) ? "100" : "10",
388-
duplex ? "full" : "half",
389-
lpa);
384+
netdev_info(mii->dev, "link up, %uMbps, %s-duplex, lpa 0x%04X\n",
385+
lpa2 & (LPA_1000FULL | LPA_1000HALF) ? 1000 :
386+
media & (ADVERTISE_100FULL | ADVERTISE_100HALF) ?
387+
100 : 10,
388+
duplex ? "full" : "half",
389+
lpa);
390390

391391
if ((init_media) || (mii->full_duplex != duplex)) {
392392
mii->full_duplex = duplex;

0 commit comments

Comments
 (0)