>From b3876b65634004dc16648016820077b21a6270dd Mon Sep 17 00:00:00 2001
From: Vladimir Oltean <vladimir.oltean@nxp.com>
Date: Mon, 1 Apr 2024 18:01:28 +0300
Subject: [PATCH 2/3] net: dsa: break out port setup and teardown code per port
 type

It is very hard to make changes to the control flow of dsa_port_setup(),
and this is because the different port types need a different setup
procedure.

By breaking these out into separate functions, it becomes clearer what
needs what, and how the teardown should look like.

Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
---
 net/dsa/dsa.c | 102 +++++++++++++++++++++++++++++++++-----------------
 1 file changed, 67 insertions(+), 35 deletions(-)

diff --git a/net/dsa/dsa.c b/net/dsa/dsa.c
index 64369fa5fd07..5d65da9a1971 100644
--- a/net/dsa/dsa.c
+++ b/net/dsa/dsa.c
@@ -460,12 +460,69 @@ static void dsa_tree_teardown_cpu_ports(struct dsa_switch_tree *dst)
 			dp->cpu_dp = NULL;
 }
 
-static int dsa_port_setup(struct dsa_port *dp)
+static int dsa_unused_port_setup(struct dsa_port *dp)
+{
+	dsa_port_disable(dp);
+
+	return 0;
+}
+
+static void dsa_unused_port_teardown(struct dsa_port *dp)
+{
+}
+
+static int dsa_shared_port_setup(struct dsa_port *dp)
 {
-	bool dsa_port_link_registered = false;
 	struct dsa_switch *ds = dp->ds;
-	bool dsa_port_enabled = false;
-	int err = 0;
+	bool link_registered = false;
+	int err;
+
+	if (dp->dn) {
+		err = dsa_shared_port_link_register_of(dp);
+		if (err)
+			return err;
+
+		link_registered = true;
+	} else {
+		dev_warn(ds->dev,
+			 "skipping link registration for %s port %d\n",
+			 dsa_port_is_cpu(dp) ? "CPU" : "DSA",
+			 dp->index);
+	}
+
+	err = dsa_port_enable(dp, NULL);
+	if (err && link_registered)
+		dsa_shared_port_link_unregister_of(dp);
+
+	return err;
+}
+
+static void dsa_shared_port_teardown(struct dsa_port *dp)
+{
+	dsa_port_disable(dp);
+	if (dp->dn)
+		dsa_shared_port_link_unregister_of(dp);
+}
+
+static int dsa_user_port_setup(struct dsa_port *dp)
+{
+	of_get_mac_address(dp->dn, dp->mac);
+
+	return dsa_user_create(dp);
+}
+
+static void dsa_user_port_teardown(struct dsa_port *dp)
+{
+	if (!dp->user)
+		return;
+
+	dsa_user_destroy(dp->user);
+	dp->user = NULL;
+}
+
+static int dsa_port_setup(struct dsa_port *dp)
+{
+	int err;
 
 	if (dp->setup)
 		return 0;
@@ -476,38 +533,17 @@ static int dsa_port_setup(struct dsa_port *dp)
 
 	switch (dp->type) {
 	case DSA_PORT_TYPE_UNUSED:
-		dsa_port_disable(dp);
+		err = dsa_unused_port_setup(dp);
 		break;
 	case DSA_PORT_TYPE_CPU:
 	case DSA_PORT_TYPE_DSA:
-		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 %s port %d\n",
-				 dsa_port_is_cpu(dp) ? "CPU" : "DSA",
-				 dp->index);
-		}
-
-		err = dsa_port_enable(dp, NULL);
-		if (err)
-			break;
-		dsa_port_enabled = true;
-
+		err = dsa_shared_port_setup(dp);
 		break;
 	case DSA_PORT_TYPE_USER:
-		of_get_mac_address(dp->dn, dp->mac);
-		err = dsa_user_create(dp);
+		err = dsa_user_port_setup(dp);
 		break;
 	}
 
-	if (err && dsa_port_enabled)
-		dsa_port_disable(dp);
-	if (err && dsa_port_link_registered)
-		dsa_shared_port_link_unregister_of(dp);
 	if (err) {
 		dsa_port_devlink_teardown(dp);
 		return err;
@@ -525,18 +561,14 @@ static void dsa_port_teardown(struct dsa_port *dp)
 
 	switch (dp->type) {
 	case DSA_PORT_TYPE_UNUSED:
+		dsa_unused_port_teardown(dp);
 		break;
 	case DSA_PORT_TYPE_CPU:
 	case DSA_PORT_TYPE_DSA:
-		dsa_port_disable(dp);
-		if (dp->dn)
-			dsa_shared_port_link_unregister_of(dp);
+		dsa_shared_port_teardown(dp);
 		break;
 	case DSA_PORT_TYPE_USER:
-		if (dp->user) {
-			dsa_user_destroy(dp->user);
-			dp->user = NULL;
-		}
+		dsa_user_port_teardown(dp);
 		break;
 	}
 
-- 
2.34.1