sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

net: phy: move duplicated code out of if/else 

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
Sascha Hauer 2013-12-11 10:53:22 +01:00
parent 58f9167a04
commit 664694d9f7
1 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
drivers/net/phy/phy.c
View File

@ -269,13 +269,6 @@ int phy_device_connect(struct eth_device *edev, struct mii_bus *bus, int addr,
ret = -EIO;
goto fail;
}
dev->interface = interface;
dev->dev_flags = flags;
ret = phy_register_device(dev);
if (ret)
goto fail;
} else {
for (i = 0; i < PHY_MAX_ADDR && !edev->phydev; i++) {
/* skip masked out PHY addresses */
@ -283,20 +276,18 @@ int phy_device_connect(struct eth_device *edev, struct mii_bus *bus, int addr,
continue;
dev = mdiobus_scan(bus, i);
if (IS_ERR(dev) || dev->attached_dev)
continue;
dev->interface = interface;
dev->dev_flags = flags;
ret = phy_register_device(dev);
if (ret)
goto fail;
break;
if (!IS_ERR(dev) && !dev->attached_dev)
break;
}
}
dev->interface = interface;
dev->dev_flags = flags;
ret = phy_register_device(dev);
if (ret)
goto fail;
edev->phydev = dev;
dev->attached_dev = edev;
phy_config_aneg(edev->phydev);