mii: Convert printks to netdev_info
authorJoe Perches <joe@perches.com>
Thu, 3 Mar 2011 20:55:08 +0000 (12:55 -0800)
committerDavid S. Miller <davem@davemloft.net>
Thu, 3 Mar 2011 21:02:32 +0000 (13:02 -0800)
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>
drivers/net/mii.c

index 210b2b1..0a6c6a2 100644 (file)
@@ -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;