net: dsa: Simplify dsa_slave_phy_setup() (399ba77a) · Commits · 戴 / test

Remove the code that tried to identify if a PHY designated by Device Tree required diversion through the DSA-created MDIO bus. This was created mainly for the bcm_sf2.c driver back when it did not have its own MDIO bus driver, which it now has since ("net: dsa: bcm_sf2: Register our slave MDIO bus"). Signed-off-by:

Florian Fainelli <f.fainelli@gmail.com> Reviewed-by:

Vivien Didelot <vivien.didelot@savoirfairelinux.com> Reviewed-by:

Andrew Lunn <andrew@lunn.ch> Tested-by:

Martin Hundebøll <mnhu@prevas.dk> Signed-off-by:

David S. Miller <davem@davemloft.net>

net/dsa/slave.c

+4 −22

Original line number	Diff line number	Diff line
		@@ -1060,28 +1060,10 @@ static int dsa_slave_phy_setup(struct net_device *slave_dev)
		phy_flags = ds->ops->get_phy_flags(ds, dp->index);

		if (phy_dn) {
		int phy_id = of_mdio_parse_addr(&slave_dev->dev, phy_dn);

		/* If this PHY address is part of phys_mii_mask, which means
		* that we need to divert reads and writes to/from it, then we
		* want to bind this device using the slave MII bus created by
		* DSA to make that happen.
		*/
		if (!phy_is_fixed && phy_id >= 0 &&
		(ds->phys_mii_mask & (1 << phy_id))) {
		ret = dsa_slave_phy_connect(slave_dev, phy_id);
		if (ret) {
		netdev_err(slave_dev, "failed to connect to phy%d: %d\n", phy_id, ret);
		of_node_put(phy_dn);
		return ret;
		}
		} else {
		slave_dev->phydev = of_phy_connect(slave_dev, phy_dn,
		dsa_slave_adjust_link,
		phy_flags,
		p->phy_interface);
		}

		of_node_put(phy_dn);
		}

Admin message