diff options
| author | Ingo Molnar <mingo@kernel.org> | 2024-03-25 13:32:29 +0300 | 
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2024-03-25 13:32:29 +0300 | 
| commit | f4566a1e73957800df75a3dd2dccee8a4697f327 (patch) | |
| tree | b043b875228c0b25988af66c680d60cae69d761d /net/dsa/dsa.c | |
| parent | b9e6e28663928cab836a19abbdec3d036a07db3b (diff) | |
| parent | 4cece764965020c22cff7665b18a012006359095 (diff) | |
| download | linux-f4566a1e73957800df75a3dd2dccee8a4697f327.tar.xz | |
Merge tag 'v6.9-rc1' into sched/core, to pick up fixes and to refresh the branch
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'net/dsa/dsa.c')
| -rw-r--r-- | net/dsa/dsa.c | 7 | 
1 files changed, 1 insertions, 6 deletions
diff --git a/net/dsa/dsa.c b/net/dsa/dsa.c index ac7be864e80d..09d2f5d4b3dd 100644 --- a/net/dsa/dsa.c +++ b/net/dsa/dsa.c @@ -15,7 +15,6 @@  #include <linux/slab.h>  #include <linux/rtnetlink.h>  #include <linux/of.h> -#include <linux/of_mdio.h>  #include <linux/of_net.h>  #include <net/dsa_stubs.h>  #include <net/sch_generic.h> @@ -626,7 +625,6 @@ static void dsa_switch_teardown_tag_protocol(struct dsa_switch *ds)  static int dsa_switch_setup(struct dsa_switch *ds)  { -	struct device_node *dn;  	int err;  	if (ds->setup) @@ -666,10 +664,7 @@ static int dsa_switch_setup(struct dsa_switch *ds)  		dsa_user_mii_bus_init(ds); -		dn = of_get_child_by_name(ds->dev->of_node, "mdio"); - -		err = of_mdiobus_register(ds->user_mii_bus, dn); -		of_node_put(dn); +		err = mdiobus_register(ds->user_mii_bus);  		if (err < 0)  			goto free_user_mii_bus;  	}  | 
