From a81a45744ba5e0de34a3c724c9a9b9c77856a3a3 Mon Sep 17 00:00:00 2001
From: Vladimir Oltean <vladimir.oltean@nxp.com>
Date: Mon, 19 Jul 2021 20:14:43 +0300
Subject: [PATCH] net: dsa: tag_8021q: use "err" consistently instead of "rc"
Some of the tag_8021q code has been taken out of sja1105, which uses
"rc" for its return code variables, whereas the DSA core uses "err".
Change tag_8021q for consistency.
Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---
net/dsa/tag_8021q.c | 46 ++++++++++++++++++++++-----------------------
1 file changed, 23 insertions(+), 23 deletions(-)
diff --git a/net/dsa/tag_8021q.c b/net/dsa/tag_8021q.c
index d657864969d4f..1c5a320197733 100644
--- a/net/dsa/tag_8021q.c
+++ b/net/dsa/tag_8021q.c
@@ -259,17 +259,17 @@ static int dsa_8021q_setup_port(struct dsa_8021q_context *ctx, int port,
int dsa_8021q_setup(struct dsa_8021q_context *ctx, bool enabled)
{
- int rc, port;
+ int err, port;
ASSERT_RTNL();
for (port = 0; port < ctx->ds->num_ports; port++) {
- rc = dsa_8021q_setup_port(ctx, port, enabled);
- if (rc < 0) {
+ err = dsa_8021q_setup_port(ctx, port, enabled);
+ if (err < 0) {
dev_err(ctx->ds->dev,
"Failed to setup VLAN tagging for port %d: %d\n",
- port, rc);
- return rc;
+ port, err);
+ return err;
}
}
@@ -357,20 +357,20 @@ int dsa_8021q_crosschip_bridge_join(struct dsa_8021q_context *ctx, int port,
* probably use dsa_towards_port.
*/
int other_upstream = dsa_upstream_port(other_ctx->ds, other_port);
- int rc;
+ int err;
- rc = dsa_8021q_crosschip_link_add(ctx, port, other_ctx, other_port);
- if (rc)
- return rc;
+ err = dsa_8021q_crosschip_link_add(ctx, port, other_ctx, other_port);
+ if (err)
+ return err;
- rc = dsa_8021q_crosschip_link_apply(ctx, port, other_ctx,
- other_port, true);
- if (rc)
- return rc;
+ err = dsa_8021q_crosschip_link_apply(ctx, port, other_ctx,
+ other_port, true);
+ if (err)
+ return err;
- rc = dsa_8021q_crosschip_link_add(ctx, port, other_ctx, other_upstream);
- if (rc)
- return rc;
+ err = dsa_8021q_crosschip_link_add(ctx, port, other_ctx, other_upstream);
+ if (err)
+ return err;
return dsa_8021q_crosschip_link_apply(ctx, port, other_ctx,
other_upstream, true);
@@ -391,18 +391,18 @@ int dsa_8021q_crosschip_bridge_leave(struct dsa_8021q_context *ctx, int port,
struct dsa_8021q_context *other_ctx = c->other_ctx;
int other_port = c->other_port;
bool keep;
- int rc;
+ int err;
dsa_8021q_crosschip_link_del(ctx, c, &keep);
if (keep)
continue;
- rc = dsa_8021q_crosschip_link_apply(ctx, port,
- other_ctx,
- other_port,
- false);
- if (rc)
- return rc;
+ err = dsa_8021q_crosschip_link_apply(ctx, port,
+ other_ctx,
+ other_port,
+ false);
+ if (err)
+ return err;
}
}
--
2.30.2