From 0c07de1fc1c541ddd05ed8116622a2bab1b179a3 Mon Sep 17 00:00:00 2001
From: Barry Grussling <barry@grussling.com>
Date: Tue, 8 Jan 2013 16:05:55 +0000
Subject: [PATCH] --- yaml --- r: 351333 b: refs/heads/master c:
 ab381a93ecedee413e13cfec456d1de40aa7eab4 h: refs/heads/master i:   351331:
 5f62c6e1bcd9079ca087f8566a238409af43a910 v: v3

---
 [refs]                            |  2 +-
 trunk/drivers/net/dsa/mv88e6060.c | 11 ++++++-----
 trunk/drivers/net/dsa/mv88e6xxx.c | 11 ++++++-----
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 345711583b29..110ffbb9cb59 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 19b2f97e468b74a8aedb4e5918bccaa5702e0742
+refs/heads/master: ab381a93ecedee413e13cfec456d1de40aa7eab4
diff --git a/trunk/drivers/net/dsa/mv88e6060.c b/trunk/drivers/net/dsa/mv88e6060.c
index 8548f8d9f75e..7a54ec04b418 100644
--- a/trunk/drivers/net/dsa/mv88e6060.c
+++ b/trunk/drivers/net/dsa/mv88e6060.c
@@ -236,7 +236,7 @@ static void mv88e6060_poll_link(struct dsa_switch *ds)
 
 		if (!link) {
 			if (netif_carrier_ok(dev)) {
-				printk(KERN_INFO "%s: link down\n", dev->name);
+				netdev_info(dev, "link down\n");
 				netif_carrier_off(dev);
 			}
 			continue;
@@ -247,10 +247,11 @@ static void mv88e6060_poll_link(struct dsa_switch *ds)
 		fc = ((port_status & 0xc000) == 0xc000) ? 1 : 0;
 
 		if (!netif_carrier_ok(dev)) {
-			printk(KERN_INFO "%s: link up, %d Mb/s, %s duplex, "
-					 "flow control %sabled\n", dev->name,
-					 speed, duplex ? "full" : "half",
-					 fc ? "en" : "dis");
+			netdev_info(dev,
+				    "link up, %d Mb/s, %s duplex, flow control %sabled\n",
+				    speed,
+				    duplex ? "full" : "half",
+				    fc ? "en" : "dis");
 			netif_carrier_on(dev);
 		}
 	}
diff --git a/trunk/drivers/net/dsa/mv88e6xxx.c b/trunk/drivers/net/dsa/mv88e6xxx.c
index afe7d80001e2..3756c74ca4be 100644
--- a/trunk/drivers/net/dsa/mv88e6xxx.c
+++ b/trunk/drivers/net/dsa/mv88e6xxx.c
@@ -356,7 +356,7 @@ void mv88e6xxx_poll_link(struct dsa_switch *ds)
 
 		if (!link) {
 			if (netif_carrier_ok(dev)) {
-				printk(KERN_INFO "%s: link down\n", dev->name);
+				netdev_info(dev, "link down\n");
 				netif_carrier_off(dev);
 			}
 			continue;
@@ -380,10 +380,11 @@ void mv88e6xxx_poll_link(struct dsa_switch *ds)
 		fc = (port_status & 0x8000) ? 1 : 0;
 
 		if (!netif_carrier_ok(dev)) {
-			printk(KERN_INFO "%s: link up, %d Mb/s, %s duplex, "
-					 "flow control %sabled\n", dev->name,
-					 speed, duplex ? "full" : "half",
-					 fc ? "en" : "dis");
+			netdev_info(dev,
+				    "link up, %d Mb/s, %s duplex, flow control %sabled\n",
+				    speed,
+				    duplex ? "full" : "half",
+				    fc ? "en" : "dis");
 			netif_carrier_on(dev);
 		}
 	}