generic: ar8216: move port initialization into a separate function

SVN-Revision: 30848

target/linux/generic/files/drivers/net/phy/ar8216.c

@@ -718,29 +718,18 @@ out:
 	return 0;
 }
 
-static int
-ar8216_reset_switch(struct switch_dev *dev)
+static void
+ar8216_init_port(struct ar8216_priv *priv, int port)
 {
-	struct ar8216_priv *priv = to_ar8216(dev);
-	int i;
-
-	mutex_lock(&priv->reg_mutex);
-	memset(&priv->vlan, 0, sizeof(struct ar8216_priv) -
-		offsetof(struct ar8216_priv, vlan));
-	for (i = 0; i < AR8X16_MAX_VLANS; i++) {
-		priv->vlan_id[i] = i;
-	}
-	for (i = 0; i < AR8216_NUM_PORTS; i++) {
 	/* Enable port learning and tx */
-		priv->write(priv, AR8216_REG_PORT_CTRL(i),
+	priv->write(priv, AR8216_REG_PORT_CTRL(port),
 		AR8216_PORT_CTRL_LEARN |
 		(4 << AR8216_PORT_CTRL_STATE_S));
 
-		priv->write(priv, AR8216_REG_PORT_VLAN(i), 0);
+	priv->write(priv, AR8216_REG_PORT_VLAN(port), 0);
 
-		/* Configure all PHYs */
-		if (i == AR8216_PORT_CPU) {
-			priv->write(priv, AR8216_REG_PORT_STATUS(i),
+	if (port == AR8216_PORT_CPU) {
+		priv->write(priv, AR8216_REG_PORT_STATUS(port),
 			AR8216_PORT_STATUS_LINK_UP |
 			((priv->chip == AR8316) ?
 				AR8216_PORT_SPEED_1000M : AR8216_PORT_SPEED_100M) |
@@ -750,10 +739,28 @@ ar8216_reset_switch(struct switch_dev *dev)
 			((priv->chip == AR8316) ? AR8216_PORT_STATUS_TXFLOW : 0) |
 			AR8216_PORT_STATUS_DUPLEX);
 	} else {
-			priv->write(priv, AR8216_REG_PORT_STATUS(i),
+		priv->write(priv, AR8216_REG_PORT_STATUS(port),
 			AR8216_PORT_STATUS_LINK_AUTO);
 	}
 }
+
+static int
+ar8216_reset_switch(struct switch_dev *dev)
+{
+	struct ar8216_priv *priv = to_ar8216(dev);
+	int i;
+
+	mutex_lock(&priv->reg_mutex);
+	memset(&priv->vlan, 0, sizeof(struct ar8216_priv) -
+		offsetof(struct ar8216_priv, vlan));
+	for (i = 0; i < AR8X16_MAX_VLANS; i++) {
+		priv->vlan_id[i] = i;
+	}
+
+	/* Configure all ports */
+	for (i = 0; i < AR8216_NUM_PORTS; i++)
+		ar8216_init_port(priv, i);
+
 	/* XXX: undocumented magic from atheros, required! */
 	priv->write(priv, 0x38, 0xc000050e);