mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-22 15:02:32 +00:00
68bc059c55
Manually rebased: backport-5.15/603-v5.19-page_pool-Add-recycle-stats-to-page_pool_put_page_bu.patch pending-5.15/723-net-mt7531-ensure-all-MACs-are-powered-down-before-r.patch* Removed upstreamed: generic-backport/610-v6.3-net-page_pool-use-in_softirq-instead.patch[1] backport-5.15/705-12-v6.0-net-dsa-mt7530-rework-mt753-01-_setup.patch[2] backport-5.15/790-v6.4-0010-net-dsa-mt7530-split-off-common-parts-from-mt7531_se.patch[3] backport-5.15/703-10-v5.16-net-dsa-introduce-helpers-for-iterating-through-port.patch[4] All other patches automatically rebased. * Modified to define the variable i as suggested by DragonBluep in PR discussion. See: https://github.com/openwrt/openwrt/pull/12823#issuecomment-1578518576 1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.115&id=3af319d5147454dc63665ef451229c674b538377 2. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.115&id=0753c1ef24194580f7165ae6e259b59a851392f2 3. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.115&id=5a7266feaa6d708fc6880a161786eaa884ef3c8e 4.9902f91cf6Build system: x86_64 Build-tested: bcm2711/RPi4B, ramips/tplink_archer-a6-v3, filogic/xiaomi_redmi-router-ax6000-ubootmod Run-tested: bcm2711/RPi4B, ramips/tplink_archer-a6-v3, filogic/xiaomi_redmi-router-ax6000-ubootmod Signed-off-by: John Audia <therealgraysky@proton.me> (cherry picked from commit5714660643)
56 lines
1.5 KiB
Diff
56 lines
1.5 KiB
Diff
From 720d736351761574af02ed093658ab60de60576c Mon Sep 17 00:00:00 2001
|
|
From: Daniel Golle <daniel@makrotopia.org>
|
|
Date: Mon, 3 Apr 2023 02:18:50 +0100
|
|
Subject: [PATCH 12/16] 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
|
|
@@ -3268,6 +3268,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);
|
|
@@ -3286,16 +3297,11 @@ 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);
|
|
-
|
|
dev_set_drvdata(&mdiodev->dev, NULL);
|
|
}
|
|
|