diff options
| author | Barry Grussling <barry@grussling.com> | 2013-01-08 11:05:55 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-01-10 03:04:34 -0500 |
| commit | ab381a93ecedee413e13cfec456d1de40aa7eab4 (patch) | |
| tree | d5b811b9432317509446dead36c156b9df104b1c | |
| parent | 19b2f97e468b74a8aedb4e5918bccaa5702e0742 (diff) | |
DSA: Convert printk calls to netdev_info calls
Convert DSA printk calls to netdev_info calls as recommended by
checkpatch.pl.
Signed-off-by: Barry Grussling <barry@grussling.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/dsa/mv88e6060.c | 11 | ||||
| -rw-r--r-- | drivers/net/dsa/mv88e6xxx.c | 11 |
2 files changed, 12 insertions, 10 deletions
diff --git a/drivers/net/dsa/mv88e6060.c b/drivers/net/dsa/mv88e6060.c index 8548f8d9f75e..7a54ec04b418 100644 --- a/drivers/net/dsa/mv88e6060.c +++ b/drivers/net/dsa/mv88e6060.c | |||
| @@ -236,7 +236,7 @@ static void mv88e6060_poll_link(struct dsa_switch *ds) | |||
| 236 | 236 | ||
| 237 | if (!link) { | 237 | if (!link) { |
| 238 | if (netif_carrier_ok(dev)) { | 238 | if (netif_carrier_ok(dev)) { |
| 239 | printk(KERN_INFO "%s: link down\n", dev->name); | 239 | netdev_info(dev, "link down\n"); |
| 240 | netif_carrier_off(dev); | 240 | netif_carrier_off(dev); |
| 241 | } | 241 | } |
| 242 | continue; | 242 | continue; |
| @@ -247,10 +247,11 @@ static void mv88e6060_poll_link(struct dsa_switch *ds) | |||
| 247 | fc = ((port_status & 0xc000) == 0xc000) ? 1 : 0; | 247 | fc = ((port_status & 0xc000) == 0xc000) ? 1 : 0; |
| 248 | 248 | ||
| 249 | if (!netif_carrier_ok(dev)) { | 249 | if (!netif_carrier_ok(dev)) { |
| 250 | printk(KERN_INFO "%s: link up, %d Mb/s, %s duplex, " | 250 | netdev_info(dev, |
| 251 | "flow control %sabled\n", dev->name, | 251 | "link up, %d Mb/s, %s duplex, flow control %sabled\n", |
| 252 | speed, duplex ? "full" : "half", | 252 | speed, |
| 253 | fc ? "en" : "dis"); | 253 | duplex ? "full" : "half", |
| 254 | fc ? "en" : "dis"); | ||
| 254 | netif_carrier_on(dev); | 255 | netif_carrier_on(dev); |
| 255 | } | 256 | } |
| 256 | } | 257 | } |
diff --git a/drivers/net/dsa/mv88e6xxx.c b/drivers/net/dsa/mv88e6xxx.c index afe7d80001e2..3756c74ca4be 100644 --- a/drivers/net/dsa/mv88e6xxx.c +++ b/drivers/net/dsa/mv88e6xxx.c | |||
| @@ -356,7 +356,7 @@ void mv88e6xxx_poll_link(struct dsa_switch *ds) | |||
| 356 | 356 | ||
| 357 | if (!link) { | 357 | if (!link) { |
| 358 | if (netif_carrier_ok(dev)) { | 358 | if (netif_carrier_ok(dev)) { |
| 359 | printk(KERN_INFO "%s: link down\n", dev->name); | 359 | netdev_info(dev, "link down\n"); |
| 360 | netif_carrier_off(dev); | 360 | netif_carrier_off(dev); |
| 361 | } | 361 | } |
| 362 | continue; | 362 | continue; |
| @@ -380,10 +380,11 @@ void mv88e6xxx_poll_link(struct dsa_switch *ds) | |||
| 380 | fc = (port_status & 0x8000) ? 1 : 0; | 380 | fc = (port_status & 0x8000) ? 1 : 0; |
| 381 | 381 | ||
| 382 | if (!netif_carrier_ok(dev)) { | 382 | if (!netif_carrier_ok(dev)) { |
| 383 | printk(KERN_INFO "%s: link up, %d Mb/s, %s duplex, " | 383 | netdev_info(dev, |
| 384 | "flow control %sabled\n", dev->name, | 384 | "link up, %d Mb/s, %s duplex, flow control %sabled\n", |
| 385 | speed, duplex ? "full" : "half", | 385 | speed, |
| 386 | fc ? "en" : "dis"); | 386 | duplex ? "full" : "half", |
| 387 | fc ? "en" : "dis"); | ||
| 387 | netif_carrier_on(dev); | 388 | netif_carrier_on(dev); |
| 388 | } | 389 | } |
| 389 | } | 390 | } |
