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

net: phy: cleanup attached device handling 

phy_register_device() currently requires an attached ethernet device.
This is not needed, a phy device can equally well be registered as
a standalone device without an ethernet device. Remove the need
for an attached ethernet device in phy_register_device. Also, make
the edev <-> phy connection on a registered device which simplifies
the code.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
Sascha Hauer 2013-12-11 10:18:40 +01:00
parent 72930d623c
commit 5f0a71708e
2 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/phy/mdio_bus.c
View File

@ -153,8 +153,6 @@ static int mdio_bus_probe(struct device_d *_dev)
int ret; int ret;
dev->attached_dev->phydev = dev;
if (drv->probe) { if (drv->probe) {
ret = drv->probe(dev); ret = drv->probe(dev);
if (ret) if (ret)
@ -204,8 +202,6 @@ static int mdio_bus_probe(struct device_d *_dev)
return 0; return 0;
err: err:
dev->attached_dev->phydev = NULL;
dev->attached_dev = NULL;
return ret; return ret;
} }

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

@ -228,7 +228,7 @@ static int phy_register_device(struct phy_device* dev)
{ {
int ret; int ret;
dev->dev.parent = &dev->attached_dev->dev; dev->dev.parent = &dev->bus->dev;
ret = register_device(&dev->dev); ret = register_device(&dev->dev);
if (ret) if (ret)
@ -259,7 +259,6 @@ int phy_device_connect(struct eth_device *edev, struct mii_bus *bus, int addr,
goto fail; goto fail;
} }
dev->attached_dev = edev;
dev->interface = interface; dev->interface = interface;
dev->dev_flags = flags; dev->dev_flags = flags;
@ -276,7 +275,6 @@ int phy_device_connect(struct eth_device *edev, struct mii_bus *bus, int addr,
if (IS_ERR(dev) || dev->attached_dev) if (IS_ERR(dev) || dev->attached_dev)
continue; continue;
dev->attached_dev = edev;
dev->interface = interface; dev->interface = interface;
dev->dev_flags = flags; dev->dev_flags = flags;
@ -287,14 +285,10 @@ int phy_device_connect(struct eth_device *edev, struct mii_bus *bus, int addr,
break; break;
} }
} }
if (!edev->phydev) {
ret = -EIO;
goto fail;
}
} }
dev = edev->phydev; edev->phydev = dev;
dev->attached_dev = edev;
drv = to_phy_driver(dev->dev.driver); drv = to_phy_driver(dev->dev.driver);
drv->config_aneg(dev); drv->config_aneg(dev);
@ -304,8 +298,6 @@ int phy_device_connect(struct eth_device *edev, struct mii_bus *bus, int addr,
return 0; return 0;
fail: fail:
if (!IS_ERR(dev))
dev->attached_dev = NULL;
puts("Unable to find a PHY (unknown ID?)\n"); puts("Unable to find a PHY (unknown ID?)\n");
return ret; return ret;
} }