Skip to content

Commit

Permalink
net: dsa: mt7530: introduce mt7530_remove_common helper function
Browse files Browse the repository at this point in the history
Move commonly used parts from mt7530_remove into new
mt7530_remove_common helper function which will be used by both,
mt7530_remove and the to-be-introduced mt7988_remove.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Daniel Golle authored and David S. Miller committed Apr 3, 2023
1 parent 37c9c0d commit 720d736
Showing 1 changed file with 12 additions and 6 deletions.
18 changes: 12 additions & 6 deletions drivers/net/dsa/mt7530.c
Original file line number Diff line number Diff line change
Expand Up @@ -3259,6 +3259,17 @@ mt7530_probe(struct mdio_device *mdiodev)
return dsa_register_switch(priv->ds);
}

static void
mt7530_remove_common(struct mt7530_priv *priv)
{
if (priv->irq)
mt7530_free_irq(priv);

dsa_unregister_switch(priv->ds);

mutex_destroy(&priv->reg_mutex);
}

static void
mt7530_remove(struct mdio_device *mdiodev)
{
Expand All @@ -3278,15 +3289,10 @@ mt7530_remove(struct mdio_device *mdiodev)
dev_err(priv->dev, "Failed to disable io pwr: %d\n",
ret);

if (priv->irq)
mt7530_free_irq(priv);

dsa_unregister_switch(priv->ds);
mt7530_remove_common(priv);

for (i = 0; i < 2; ++i)
mtk_pcs_lynxi_destroy(priv->ports[5 + i].sgmii_pcs);

mutex_destroy(&priv->reg_mutex);
}

static void mt7530_shutdown(struct mdio_device *mdiodev)
Expand Down

0 comments on commit 720d736

Please sign in to comment.