mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-27 03:10:12 +00:00
net: dsa: ocelot: use lynx_pcs_create_mdiodev()
Use the newly introduced lynx_pcs_create_mdiodev() which simplifies the creation and destruction of the lynx PCS. Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk> Reviewed-by: Andrew Lunn <andrew@lunn.ch> Reviewed-by: Vladimir Oltean <vladimir.oltean@nxp.com> Tested-by: Vladimir Oltean <vladimir.oltean@nxp.com> Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
parent
86b5f2d8cd
commit
5767c6a8d9
2 changed files with 8 additions and 32 deletions
|
@ -1021,7 +1021,6 @@ static int vsc9959_mdio_bus_alloc(struct ocelot *ocelot)
|
|||
for (port = 0; port < felix->info->num_ports; port++) {
|
||||
struct ocelot_port *ocelot_port = ocelot->ports[port];
|
||||
struct phylink_pcs *phylink_pcs;
|
||||
struct mdio_device *mdio_device;
|
||||
|
||||
if (dsa_is_unused_port(felix->ds, port))
|
||||
continue;
|
||||
|
@ -1029,16 +1028,10 @@ static int vsc9959_mdio_bus_alloc(struct ocelot *ocelot)
|
|||
if (ocelot_port->phy_mode == PHY_INTERFACE_MODE_INTERNAL)
|
||||
continue;
|
||||
|
||||
mdio_device = mdio_device_create(felix->imdio, port);
|
||||
if (IS_ERR(mdio_device))
|
||||
phylink_pcs = lynx_pcs_create_mdiodev(felix->imdio, port);
|
||||
if (IS_ERR(phylink_pcs))
|
||||
continue;
|
||||
|
||||
phylink_pcs = lynx_pcs_create(mdio_device);
|
||||
if (!phylink_pcs) {
|
||||
mdio_device_free(mdio_device);
|
||||
continue;
|
||||
}
|
||||
|
||||
felix->pcs[port] = phylink_pcs;
|
||||
|
||||
dev_info(dev, "Found PCS at internal MDIO address %d\n", port);
|
||||
|
@ -1054,14 +1047,9 @@ static void vsc9959_mdio_bus_free(struct ocelot *ocelot)
|
|||
|
||||
for (port = 0; port < ocelot->num_phys_ports; port++) {
|
||||
struct phylink_pcs *phylink_pcs = felix->pcs[port];
|
||||
struct mdio_device *mdio_device;
|
||||
|
||||
if (!phylink_pcs)
|
||||
continue;
|
||||
|
||||
mdio_device = lynx_get_mdio_device(phylink_pcs);
|
||||
mdio_device_free(mdio_device);
|
||||
lynx_pcs_destroy(phylink_pcs);
|
||||
if (phylink_pcs)
|
||||
lynx_pcs_destroy(phylink_pcs);
|
||||
}
|
||||
mdiobus_unregister(felix->imdio);
|
||||
mdiobus_free(felix->imdio);
|
||||
|
|
|
@ -912,7 +912,6 @@ static int vsc9953_mdio_bus_alloc(struct ocelot *ocelot)
|
|||
for (port = 0; port < felix->info->num_ports; port++) {
|
||||
struct ocelot_port *ocelot_port = ocelot->ports[port];
|
||||
struct phylink_pcs *phylink_pcs;
|
||||
struct mdio_device *mdio_device;
|
||||
int addr = port + 4;
|
||||
|
||||
if (dsa_is_unused_port(felix->ds, port))
|
||||
|
@ -921,16 +920,10 @@ static int vsc9953_mdio_bus_alloc(struct ocelot *ocelot)
|
|||
if (ocelot_port->phy_mode == PHY_INTERFACE_MODE_INTERNAL)
|
||||
continue;
|
||||
|
||||
mdio_device = mdio_device_create(felix->imdio, addr);
|
||||
if (IS_ERR(mdio_device))
|
||||
phylink_pcs = lynx_pcs_create_mdiodev(felix->imdio, addr);
|
||||
if (IS_ERR(phylink_pcs))
|
||||
continue;
|
||||
|
||||
phylink_pcs = lynx_pcs_create(mdio_device);
|
||||
if (!phylink_pcs) {
|
||||
mdio_device_free(mdio_device);
|
||||
continue;
|
||||
}
|
||||
|
||||
felix->pcs[port] = phylink_pcs;
|
||||
|
||||
dev_info(dev, "Found PCS at internal MDIO address %d\n", addr);
|
||||
|
@ -946,14 +939,9 @@ static void vsc9953_mdio_bus_free(struct ocelot *ocelot)
|
|||
|
||||
for (port = 0; port < ocelot->num_phys_ports; port++) {
|
||||
struct phylink_pcs *phylink_pcs = felix->pcs[port];
|
||||
struct mdio_device *mdio_device;
|
||||
|
||||
if (!phylink_pcs)
|
||||
continue;
|
||||
|
||||
mdio_device = lynx_get_mdio_device(phylink_pcs);
|
||||
mdio_device_free(mdio_device);
|
||||
lynx_pcs_destroy(phylink_pcs);
|
||||
if (phylink_pcs)
|
||||
lynx_pcs_destroy(phylink_pcs);
|
||||
}
|
||||
|
||||
/* mdiobus_unregister and mdiobus_free handled by devres */
|
||||
|
|
Loading…
Reference in a new issue