Skip to content

Commit 709776e

Browse files
vladimirolteandavem330
authored andcommitted
net: dsa: qca8k: consistently use "ret" rather than "err" for error codes
It was pointed out during the review [1] of commit 68e1010 ("net: dsa: qca8k: put MDIO bus OF node on qca8k_mdio_register() failure") that the rest of the qca8k driver uses "int ret" rather than "int err". Make everything consistent in that regard, not only qca8k_mdio_register(), but also qca8k_setup_mdio_bus(). [1] https://lore.kernel.org/netdev/qyl2w3ownx5q7363kqxib52j5htar4y6pkn7gen27rj45xr4on@pvy5agi6o2te/ Suggested-by: Alvin Šipraga <alsi@bang-olufsen.dk> Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com> Reviewed-by: Andrew Lunn <andrew@lunn.ch> Reviewed-by: Christian Marangi <ansuelsmth@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
1 parent 0893232 commit 709776e

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

drivers/net/dsa/qca/qca8k-8xxx.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -950,15 +950,15 @@ qca8k_mdio_register(struct qca8k_priv *priv)
950950
struct device *dev = ds->dev;
951951
struct device_node *mdio;
952952
struct mii_bus *bus;
953-
int err = 0;
953+
int ret = 0;
954954

955955
mdio = of_get_child_by_name(dev->of_node, "mdio");
956956
if (mdio && !of_device_is_available(mdio))
957957
goto out_put_node;
958958

959959
bus = devm_mdiobus_alloc(dev);
960960
if (!bus) {
961-
err = -ENOMEM;
961+
ret = -ENOMEM;
962962
goto out_put_node;
963963
}
964964

@@ -984,11 +984,11 @@ qca8k_mdio_register(struct qca8k_priv *priv)
984984
bus->write = qca8k_legacy_mdio_write;
985985
}
986986

987-
err = devm_of_mdiobus_register(dev, bus, mdio);
987+
ret = devm_of_mdiobus_register(dev, bus, mdio);
988988

989989
out_put_node:
990990
of_node_put(mdio);
991-
return err;
991+
return ret;
992992
}
993993

994994
static int
@@ -997,7 +997,7 @@ qca8k_setup_mdio_bus(struct qca8k_priv *priv)
997997
u32 internal_mdio_mask = 0, external_mdio_mask = 0, reg;
998998
struct device_node *ports, *port;
999999
phy_interface_t mode;
1000-
int err;
1000+
int ret;
10011001

10021002
ports = of_get_child_by_name(priv->dev->of_node, "ports");
10031003
if (!ports)
@@ -1007,11 +1007,11 @@ qca8k_setup_mdio_bus(struct qca8k_priv *priv)
10071007
return -EINVAL;
10081008

10091009
for_each_available_child_of_node(ports, port) {
1010-
err = of_property_read_u32(port, "reg", &reg);
1011-
if (err) {
1010+
ret = of_property_read_u32(port, "reg", &reg);
1011+
if (ret) {
10121012
of_node_put(port);
10131013
of_node_put(ports);
1014-
return err;
1014+
return ret;
10151015
}
10161016

10171017
if (!dsa_is_user_port(priv->ds, reg))

0 commit comments

Comments
 (0)