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>

diff --git a/net/dsa/slave.c b/net/dsa/slave.c
index 589aafd01fc5256a0fac138bac3240ab191b507e..d104ae15836fe801beaeb10a9c9f031a3413e4ec 100644 (file)
--- a/net/dsa/slave.c
+++ b/net/dsa/slave.c
@@ -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;
 }