Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-17 18:56:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

net: dsa: mt7530: introduce mt7530_remove_common helper function

Browse Source 
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>
This commit is contained in:
Daniel Golle 2023-04-03 02:18:50 +01:00 committed by David S. Miller
parent 37c9c0d8d0
commit 720d736351
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/net/dsa/mt7530.c
View File

@ -3259,6 +3259,17 @@ mt7530_probe(struct mdio_device *mdiodev)
return dsa_register_switch(priv->ds); 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 static void
mt7530_remove(struct mdio_device *mdiodev) mt7530_remove(struct mdio_device *mdiodev)
{ {
@ -3278,15 +3289,10 @@ mt7530_remove(struct mdio_device *mdiodev)
dev_err(priv->dev, "Failed to disable io pwr: %d\n", dev_err(priv->dev, "Failed to disable io pwr: %d\n",
ret); ret);
if (priv->irq) mt7530_remove_common(priv);
mt7530_free_irq(priv);
dsa_unregister_switch(priv->ds);
for (i = 0; i < 2; ++i) for (i = 0; i < 2; ++i)
mtk_pcs_lynxi_destroy(priv->ports[5 + i].sgmii_pcs); mtk_pcs_lynxi_destroy(priv->ports[5 + i].sgmii_pcs);
mutex_destroy(&priv->reg_mutex);
} }
static void mt7530_shutdown(struct mdio_device *mdiodev) static void mt7530_shutdown(struct mdio_device *mdiodev)