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:
parent
72930d623c
commit
5f0a71708e
|
@ -153,8 +153,6 @@ static int mdio_bus_probe(struct device_d *_dev)
|
|||
|
||||
int ret;
|
||||
|
||||
dev->attached_dev->phydev = dev;
|
||||
|
||||
if (drv->probe) {
|
||||
ret = drv->probe(dev);
|
||||
if (ret)
|
||||
|
@ -204,8 +202,6 @@ static int mdio_bus_probe(struct device_d *_dev)
|
|||
return 0;
|
||||
|
||||
err:
|
||||
dev->attached_dev->phydev = NULL;
|
||||
dev->attached_dev = NULL;
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
|
|
@ -228,7 +228,7 @@ static int phy_register_device(struct phy_device* dev)
|
|||
{
|
||||
int ret;
|
||||
|
||||
dev->dev.parent = &dev->attached_dev->dev;
|
||||
dev->dev.parent = &dev->bus->dev;
|
||||
|
||||
ret = register_device(&dev->dev);
|
||||
if (ret)
|
||||
|
@ -259,7 +259,6 @@ int phy_device_connect(struct eth_device *edev, struct mii_bus *bus, int addr,
|
|||
goto fail;
|
||||
}
|
||||
|
||||
dev->attached_dev = edev;
|
||||
dev->interface = interface;
|
||||
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)
|
||||
continue;
|
||||
|
||||
dev->attached_dev = edev;
|
||||
dev->interface = interface;
|
||||
dev->dev_flags = flags;
|
||||
|
||||
|
@ -287,14 +285,10 @@ int phy_device_connect(struct eth_device *edev, struct mii_bus *bus, int addr,
|
|||
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->config_aneg(dev);
|
||||
|
@ -304,8 +298,6 @@ int phy_device_connect(struct eth_device *edev, struct mii_bus *bus, int addr,
|
|||
return 0;
|
||||
|
||||
fail:
|
||||
if (!IS_ERR(dev))
|
||||
dev->attached_dev = NULL;
|
||||
puts("Unable to find a PHY (unknown ID?)\n");
|
||||
return ret;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue