| Message ID | 20240104140037.374166-8-vladimir.oltean@nxp.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 5c5d6b34b683c044a5d61dc0ace94e5c20f32bcf |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | ds->user_mii_bus cleanup (part 1) | expand |
On Thu, Jan 04, 2024 at 04:00:34PM +0200, Vladimir Oltean wrote: > __of_mdiobus_register() already calls __mdiobus_register() if the > OF node provided as argument is NULL. We can take advantage of that > and simplify the 2 code path, calling devm_of_mdiobus_register() only > once for both cases. > > Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com> Much neater! Reviewed-by: Alvin Šipraga <alsi@bang-olufsen.dk> > --- > drivers/net/dsa/qca/qca8k-8xxx.c | 24 +++++++++++------------- > 1 file changed, 11 insertions(+), 13 deletions(-)
On 1/4/24 06:00, Vladimir Oltean wrote: > __of_mdiobus_register() already calls __mdiobus_register() if the > OF node provided as argument is NULL. We can take advantage of that > and simplify the 2 code path, calling devm_of_mdiobus_register() only > once for both cases. > > Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com> Reviewed-by: Florian Fainelli <florian.fainelli@broadcom.com>
On Thu, Jan 04, 2024 at 04:00:34PM +0200, Vladimir Oltean wrote: > __of_mdiobus_register() already calls __mdiobus_register() if the > OF node provided as argument is NULL. We can take advantage of that > and simplify the 2 code path, calling devm_of_mdiobus_register() only > once for both cases. > > Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com> Reviewed-by: Christian Marangi <ansuelsmth@gmail.com>
> __of_mdiobus_register() already calls __mdiobus_register() if the > OF node provided as argument is NULL. We can take advantage of that > and simplify the 2 code path, calling devm_of_mdiobus_register() only > once for both cases. > > Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com> I should have read all the series before... :-) Reviewed-by: Luiz Angelo Daros de Luca <luizluca@gmail.com>
diff --git a/drivers/net/dsa/qca/qca8k-8xxx.c b/drivers/net/dsa/qca/qca8k-8xxx.c index 8f69b95c894d..f12bdb30796f 100644 --- a/drivers/net/dsa/qca/qca8k-8xxx.c +++ b/drivers/net/dsa/qca/qca8k-8xxx.c @@ -967,25 +967,23 @@ qca8k_mdio_register(struct qca8k_priv *priv) ds->dst->index, ds->index); bus->parent = ds->dev; - /* Check if the devicetree declare the port:phy mapping */ if (mdio) { + /* Check if the device tree declares the port:phy mapping */ bus->name = "qca8k user mii"; bus->read = qca8k_internal_mdio_read; bus->write = qca8k_internal_mdio_write; - err = devm_of_mdiobus_register(priv->dev, bus, mdio); - goto out_put_node; + } else { + /* If a mapping can't be found, the legacy mapping is used, + * using qca8k_port_to_phy() + */ + ds->user_mii_bus = bus; + bus->phy_mask = ~ds->phys_mii_mask; + bus->name = "qca8k-legacy user mii"; + bus->read = qca8k_legacy_mdio_read; + bus->write = qca8k_legacy_mdio_write; } - /* If a mapping can't be found the legacy mapping is used, - * using the qca8k_port_to_phy function - */ - ds->user_mii_bus = bus; - bus->phy_mask = ~ds->phys_mii_mask; - bus->name = "qca8k-legacy user mii"; - bus->read = qca8k_legacy_mdio_read; - bus->write = qca8k_legacy_mdio_write; - - err = devm_mdiobus_register(priv->dev, bus); + err = devm_of_mdiobus_register(priv->dev, bus, mdio); out_put_node: of_node_put(mdio);
__of_mdiobus_register() already calls __mdiobus_register() if the OF node provided as argument is NULL. We can take advantage of that and simplify the 2 code path, calling devm_of_mdiobus_register() only once for both cases. Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com> --- drivers/net/dsa/qca/qca8k-8xxx.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-)