diff options
author | Joe Perches <joe@perches.com> | 2014-11-09 19:32:46 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-11-11 13:30:57 -0500 |
commit | a2ae6007a442d6bb27d77bf20ec1b06cda9e306e (patch) | |
tree | 6bf28d8f5d0e87c274465178e7ef211f3a1c1a9f /net/dsa/slave.c | |
parent | 008e81656c32e34c0b248bd203872d15be8770b7 (diff) |
dsa: Use netdev_<level> instead of printk
Neaten and standardize the logging output.
Other miscellanea:
o Use pr_notice_once instead of a guard flag.
o Convert existing pr_<level> uses too.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/dsa/slave.c')
-rw-r--r-- | net/dsa/slave.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/net/dsa/slave.c b/net/dsa/slave.c index 0ea466dad818..528380a3e296 100644 --- a/net/dsa/slave.c +++ b/net/dsa/slave.c | |||
@@ -532,7 +532,7 @@ static void dsa_slave_phy_setup(struct dsa_slave_priv *p, | |||
532 | */ | 532 | */ |
533 | ret = of_phy_register_fixed_link(port_dn); | 533 | ret = of_phy_register_fixed_link(port_dn); |
534 | if (ret) { | 534 | if (ret) { |
535 | pr_err("failed to register fixed PHY\n"); | 535 | netdev_err(slave_dev, "failed to register fixed PHY\n"); |
536 | return; | 536 | return; |
537 | } | 537 | } |
538 | phy_is_fixed = true; | 538 | phy_is_fixed = true; |
@@ -558,8 +558,8 @@ static void dsa_slave_phy_setup(struct dsa_slave_priv *p, | |||
558 | phy_connect_direct(slave_dev, p->phy, dsa_slave_adjust_link, | 558 | phy_connect_direct(slave_dev, p->phy, dsa_slave_adjust_link, |
559 | p->phy_interface); | 559 | p->phy_interface); |
560 | } else { | 560 | } else { |
561 | pr_info("attached PHY at address %d [%s]\n", | 561 | netdev_info(slave_dev, "attached PHY at address %d [%s]\n", |
562 | p->phy->addr, p->phy->drv->name); | 562 | p->phy->addr, p->phy->drv->name); |
563 | } | 563 | } |
564 | } | 564 | } |
565 | 565 | ||
@@ -657,8 +657,8 @@ dsa_slave_create(struct dsa_switch *ds, struct device *parent, | |||
657 | 657 | ||
658 | ret = register_netdev(slave_dev); | 658 | ret = register_netdev(slave_dev); |
659 | if (ret) { | 659 | if (ret) { |
660 | printk(KERN_ERR "%s: error %d registering interface %s\n", | 660 | netdev_err(master, "error %d registering interface %s\n", |
661 | master->name, ret, slave_dev->name); | 661 | ret, slave_dev->name); |
662 | free_netdev(slave_dev); | 662 | free_netdev(slave_dev); |
663 | return NULL; | 663 | return NULL; |
664 | } | 664 | } |