>From 205b3503ca15c93ba8e90d42bb2855fa0c8497e3 Mon Sep 17 00:00:00 2001 From: Vladimir Oltean Date: Mon, 1 Apr 2024 17:43:29 +0300 Subject: [PATCH 1/3] net: dsa: consolidate setup and teardown for shared ports CPU and DSA ports have the same port setup and teardown logic, only the string that gets printed on error differs. Consolidate the code paths. Signed-off-by: Vladimir Oltean --- net/dsa/dsa.c | 24 ++---------------------- 1 file changed, 2 insertions(+), 22 deletions(-) diff --git a/net/dsa/dsa.c b/net/dsa/dsa.c index 09d2f5d4b3dd..64369fa5fd07 100644 --- a/net/dsa/dsa.c +++ b/net/dsa/dsa.c @@ -479,23 +479,6 @@ static int dsa_port_setup(struct dsa_port *dp) dsa_port_disable(dp); break; case DSA_PORT_TYPE_CPU: - if (dp->dn) { - err = dsa_shared_port_link_register_of(dp); - if (err) - break; - dsa_port_link_registered = true; - } else { - dev_warn(ds->dev, - "skipping link registration for CPU port %d\n", - dp->index); - } - - err = dsa_port_enable(dp, NULL); - if (err) - break; - dsa_port_enabled = true; - - break; case DSA_PORT_TYPE_DSA: if (dp->dn) { err = dsa_shared_port_link_register_of(dp); @@ -504,7 +487,8 @@ static int dsa_port_setup(struct dsa_port *dp) dsa_port_link_registered = true; } else { dev_warn(ds->dev, - "skipping link registration for DSA port %d\n", + "skipping link registration for %s port %d\n", + dsa_port_is_cpu(dp) ? "CPU" : "DSA", dp->index); } @@ -543,10 +527,6 @@ static void dsa_port_teardown(struct dsa_port *dp) case DSA_PORT_TYPE_UNUSED: break; case DSA_PORT_TYPE_CPU: - dsa_port_disable(dp); - if (dp->dn) - dsa_shared_port_link_unregister_of(dp); - break; case DSA_PORT_TYPE_DSA: dsa_port_disable(dp); if (dp->dn) -- 2.34.1