Commit b750f5b4 authored Feb 09, 2015 by Andrew Lunn Committed by David S. Miller Feb 09, 2015

net: dsa: Remove redundant phy_attach()



dsa_slave_phy_setup() finds the phy for the port via device tree and
using of_phy_connect(), or it uses the fall back of taking a phy from
the switch internal mdio bus and calling phy_connect_direct(). Either
way, if a phy is found, phy_attach_direct() is called to attach the
phy to the slave device.

In dsa_slave_create(), a second call to phy_attach() is made. This
results in the warning "PHY already attached". Remove this second,
redundant attaching of the phy.

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Acked-by: Florian Fainelli <f.fainelli@gmail.com>
Tested-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent a4870f79

net/dsa/slave.c

+0 −13

Original line number	Diff line number	Diff line
		@@ -676,18 +676,5 @@ dsa_slave_create(struct dsa_switch ds, struct device parent,

		netif_carrier_off(slave_dev);

		if (p->phy != NULL) {
		if (ds->drv->get_phy_flags)
		p->phy->dev_flags \|= ds->drv->get_phy_flags(ds, port);

		phy_attach(slave_dev, dev_name(&p->phy->dev),
		PHY_INTERFACE_MODE_GMII);

		p->phy->autoneg = AUTONEG_ENABLE;
		p->phy->speed = 0;
		p->phy->duplex = 0;
		p->phy->advertising = p->phy->supported \| ADVERTISED_Autoneg;
		}

		return slave_dev;
		}