net: dsa: sja1105: allow XPCS to handle mdiodev lifetime

Russell King (Oracle) · davem330 · commit 9607eaadba68 · 2023-06-05T11:26:02.000+01:00
Put the mdiodev after xpcs_create() so that the XPCS driver can manage
the lifetime of the mdiodev its using.

Signed-off-by: Russell King (Oracle) &lt;rmk+kernel@armlinux.org.uk&gt;
Reviewed-by: Vladimir Oltean &lt;vladimir.oltean@nxp.com&gt;
Tested-by: Vladimir Oltean &lt;vladimir.oltean@nxp.com&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/drivers/net/dsa/sja1105/sja1105_mdio.c b/drivers/net/dsa/sja1105/sja1105_mdio.c
@@ -417,6 +417,7 @@ static int sja1105_mdiobus_pcs_register(struct sja1105_private *priv)
 		}
 
 		xpcs = xpcs_create(mdiodev, priv->phy_mode[port]);
+		mdio_device_put(mdiodev);
 		if (IS_ERR(xpcs)) {
 			rc = PTR_ERR(xpcs);
 			goto out_pcs_free;
@@ -434,7 +435,6 @@ static int sja1105_mdiobus_pcs_register(struct sja1105_private *priv)
 		if (!priv->xpcs[port])
 			continue;
 
-		mdio_device_free(priv->xpcs[port]->mdiodev);
 		xpcs_destroy(priv->xpcs[port]);
 		priv->xpcs[port] = NULL;
 	}
@@ -457,7 +457,6 @@ static void sja1105_mdiobus_pcs_unregister(struct sja1105_private *priv)
 		if (!priv->xpcs[port])
 			continue;
 
-		mdio_device_free(priv->xpcs[port]->mdiodev);
 		xpcs_destroy(priv->xpcs[port]);
 		priv->xpcs[port] = NULL;
 	}

Original file line number	Diff line number	Diff line change
`@@ -417,6 +417,7 @@ static int sja1105_mdiobus_pcs_register(struct sja1105_private *priv)`
`417`	`417`	`}`
`418`	`418`
`419`	`419`	`xpcs = xpcs_create(mdiodev, priv->phy_mode[port]);`
	`420`	`+ mdio_device_put(mdiodev);`
`420`	`421`	`if (IS_ERR(xpcs)) {`
`421`	`422`	`rc = PTR_ERR(xpcs);`
`422`	`423`	`goto out_pcs_free;`
`@@ -434,7 +435,6 @@ static int sja1105_mdiobus_pcs_register(struct sja1105_private *priv)`
`434`	`435`	`if (!priv->xpcs[port])`
`435`	`436`	`continue;`
`436`	`437`
`437`		`- mdio_device_free(priv->xpcs[port]->mdiodev);`
`438`	`438`	`xpcs_destroy(priv->xpcs[port]);`
`439`	`439`	`priv->xpcs[port] = NULL;`
`440`	`440`	`}`
`@@ -457,7 +457,6 @@ static void sja1105_mdiobus_pcs_unregister(struct sja1105_private *priv)`
`457`	`457`	`if (!priv->xpcs[port])`
`458`	`458`	`continue;`
`459`	`459`
`460`		`- mdio_device_free(priv->xpcs[port]->mdiodev);`
`461`	`460`	`xpcs_destroy(priv->xpcs[port]);`
`462`	`461`	`priv->xpcs[port] = NULL;`
`463`	`462`	`}`