Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm

[linux-2.6-block.git] / net / dsa / dsa2.c

diff --git a/net/dsa/dsa2.c b/net/dsa/dsa2.c
index cf933225df32492c084567215a2333ed55ada802..cac48a741f27c419f68a2258c0ff0a254687db55 100644 (file)
--- a/net/dsa/dsa2.c
+++ b/net/dsa/dsa2.c
@@ -13,6 +13,7 @@
 #include <linux/slab.h>
 #include <linux/rtnetlink.h>
 #include <linux/of.h>
+#include <linux/of_mdio.h>
 #include <linux/of_net.h>
 #include <net/devlink.h>
 #include <net/sch_generic.h>
@@ -809,22 +810,18 @@ static int dsa_switch_setup_tag_protocol(struct dsa_switch *ds)
 {
        const struct dsa_device_ops *tag_ops = ds->dst->tag_ops;
        struct dsa_switch_tree *dst = ds->dst;
-       struct dsa_port *cpu_dp;
        int err;
 
        if (tag_ops->proto == dst->default_proto)
                goto connect;
 
-       dsa_switch_for_each_cpu_port(cpu_dp, ds) {
-               rtnl_lock();
-               err = ds->ops->change_tag_protocol(ds, cpu_dp->index,
-                                                  tag_ops->proto);
-               rtnl_unlock();
-               if (err) {
-                       dev_err(ds->dev, "Unable to use tag protocol \"%s\": %pe\n",
-                               tag_ops->name, ERR_PTR(err));
-                       return err;
-               }
+       rtnl_lock();
+       err = ds->ops->change_tag_protocol(ds, tag_ops->proto);
+       rtnl_unlock();
+       if (err) {
+               dev_err(ds->dev, "Unable to use tag protocol \"%s\": %pe\n",
+                       tag_ops->name, ERR_PTR(err));
+               return err;
        }
 
 connect:
@@ -856,6 +853,7 @@ disconnect:
 static int dsa_switch_setup(struct dsa_switch *ds)
 {
        struct dsa_devlink_priv *dl_priv;
+       struct device_node *dn;
        struct dsa_port *dp;
        int err;
 
@@ -911,7 +909,10 @@ static int dsa_switch_setup(struct dsa_switch *ds)
 
                dsa_slave_mii_bus_init(ds);
 
-               err = mdiobus_register(ds->slave_mii_bus);
+               dn = of_get_child_by_name(ds->dev->of_node, "mdio");
+
+               err = of_mdiobus_register(ds->slave_mii_bus, dn);
+               of_node_put(dn);
                if (err < 0)
                        goto free_slave_mii_bus;
        }