net: phy: move duplicated code out of if/else
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
parent
58f9167a04
commit
664694d9f7
|
@ -269,13 +269,6 @@ int phy_device_connect(struct eth_device *edev, struct mii_bus *bus, int addr,
|
||||||
ret = -EIO;
|
ret = -EIO;
|
||||||
goto fail;
|
goto fail;
|
||||||
}
|
}
|
||||||
|
|
||||||
dev->interface = interface;
|
|
||||||
dev->dev_flags = flags;
|
|
||||||
|
|
||||||
ret = phy_register_device(dev);
|
|
||||||
if (ret)
|
|
||||||
goto fail;
|
|
||||||
} else {
|
} else {
|
||||||
for (i = 0; i < PHY_MAX_ADDR && !edev->phydev; i++) {
|
for (i = 0; i < PHY_MAX_ADDR && !edev->phydev; i++) {
|
||||||
/* skip masked out PHY addresses */
|
/* skip masked out PHY addresses */
|
||||||
|
@ -283,20 +276,18 @@ int phy_device_connect(struct eth_device *edev, struct mii_bus *bus, int addr,
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
dev = mdiobus_scan(bus, i);
|
dev = mdiobus_scan(bus, i);
|
||||||
if (IS_ERR(dev) || dev->attached_dev)
|
if (!IS_ERR(dev) && !dev->attached_dev)
|
||||||
continue;
|
break;
|
||||||
|
|
||||||
dev->interface = interface;
|
|
||||||
dev->dev_flags = flags;
|
|
||||||
|
|
||||||
ret = phy_register_device(dev);
|
|
||||||
if (ret)
|
|
||||||
goto fail;
|
|
||||||
|
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
dev->interface = interface;
|
||||||
|
dev->dev_flags = flags;
|
||||||
|
|
||||||
|
ret = phy_register_device(dev);
|
||||||
|
if (ret)
|
||||||
|
goto fail;
|
||||||
|
|
||||||
edev->phydev = dev;
|
edev->phydev = dev;
|
||||||
dev->attached_dev = edev;
|
dev->attached_dev = edev;
|
||||||
phy_config_aneg(edev->phydev);
|
phy_config_aneg(edev->phydev);
|
||||||
|
|
Loading…
Reference in New Issue