mirror of
https://git.openwrt.org/openwrt/openwrt.git
synced 2024-06-11 01:06:23 +02:00
d1ac7230d0
Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.1.50 All patches automatically rebased. Build system: x86/64 Build-tested: x86/64/AMD Cezanne, filogic/xiaomi_redmi-router-ax6000-ubootmod, ipq806x/R7800 Run-tested: x86/64/AMD Cezanne, filogic/xiaomi_redmi-router-ax6000-ubootmod, ipq806x/R7800 Signed-off-by: John Audia <therealgraysky@proton.me>
55 lines
1.5 KiB
Diff
55 lines
1.5 KiB
Diff
From 69b838d2629e6b82bcd9e0ab3c1c03f46e5e01d3 Mon Sep 17 00:00:00 2001
|
|
From: Daniel Golle <daniel@makrotopia.org>
|
|
Date: Mon, 3 Apr 2023 02:18:50 +0100
|
|
Subject: [PATCH 09/13] net: dsa: mt7530: introduce mt7530_remove_common helper
|
|
function
|
|
|
|
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>
|
|
---
|
|
drivers/net/dsa/mt7530.c | 18 ++++++++++++------
|
|
1 file changed, 12 insertions(+), 6 deletions(-)
|
|
|
|
--- a/drivers/net/dsa/mt7530.c
|
|
+++ b/drivers/net/dsa/mt7530.c
|
|
@@ -3295,6 +3295,17 @@ mt7530_probe(struct mdio_device *mdiodev
|
|
}
|
|
|
|
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)
|
|
{
|
|
struct mt7530_priv *priv = dev_get_drvdata(&mdiodev->dev);
|
|
@@ -3313,15 +3324,10 @@ mt7530_remove(struct mdio_device *mdiode
|
|
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)
|