Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 967faf3b authored by Joe Perches's avatar Joe Perches Committed by David S. Miller
Browse files

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: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7542db8b

drivers/net/mii.c

+7 −7
Original line number Diff line number Diff line
@@ -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,10 +381,10 @@ 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",

		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);