Drop net-stmmac-dwmac-rk-fix-unbalanced-pm_runtime_enable.patch

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-5.13/net-stmmac-dwmac-rk-fix-unbalanced-pm_runtime_enable.patch b/queue-5.13/net-stmmac-dwmac-rk-fix-unbalanced-pm_runtime_enable.patch
deleted file mode 100644 (file)
index ecbf287..0000000
--- a/queue-5.13/net-stmmac-dwmac-rk-fix-unbalanced-pm_runtime_enable.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From 6603d94f0e7df4157d3a42e6cb6ea2fbaa9f0332 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 23 Aug 2021 16:37:54 +0200
-Subject: net: stmmac: dwmac-rk: fix unbalanced pm_runtime_enable warnings
-
-From: Michael Riesch <michael.riesch@wolfvision.net>
-
-[ Upstream commit 2d26f6e39afb88d32b8f39e76a51b542c3c51674 ]
-
-This reverts commit 2c896fb02e7f65299646f295a007bda043e0f382
-"net: stmmac: dwmac-rk: add pd_gmac support for rk3399" and fixes
-unbalanced pm_runtime_enable warnings.
-
-In the commit to be reverted, support for power management was
-introduced to the Rockchip glue code. Later, power management support
-was introduced to the stmmac core code, resulting in multiple
-invocations of pm_runtime_{enable,disable,get_sync,put_sync}.
-
-The multiple invocations happen in rk_gmac_powerup and
-stmmac_{dvr_probe, resume} as well as in rk_gmac_powerdown and
-stmmac_{dvr_remove, suspend}, respectively, which are always called
-in conjunction.
-
-Fixes: 5ec55823438e850c91c6b92aec93fb04ebde29e2 ("net: stmmac: add clocks management for gmac driver")
-Signed-off-by: Michael Riesch <michael.riesch@wolfvision.net>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c | 9 ---------
- 1 file changed, 9 deletions(-)
-
-diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c
-index 8d28a536e1bb..084cede5190d 100644
---- a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c
-+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c
-@@ -21,7 +21,6 @@
- #include <linux/delay.h>
- #include <linux/mfd/syscon.h>
- #include <linux/regmap.h>
--#include <linux/pm_runtime.h>
- 
- #include "stmmac_platform.h"
- 
-@@ -1336,9 +1335,6 @@ static int rk_gmac_powerup(struct rk_priv_data *bsp_priv)
-               return ret;
-       }
- 
--      pm_runtime_enable(dev);
--      pm_runtime_get_sync(dev);
--
-       if (bsp_priv->integrated_phy)
-               rk_gmac_integrated_phy_powerup(bsp_priv);
- 
-@@ -1347,14 +1343,9 @@ static int rk_gmac_powerup(struct rk_priv_data *bsp_priv)
- 
- static void rk_gmac_powerdown(struct rk_priv_data *gmac)
- {
--      struct device *dev = &gmac->pdev->dev;
--
-       if (gmac->integrated_phy)
-               rk_gmac_integrated_phy_powerdown(gmac);
- 
--      pm_runtime_put_sync(dev);
--      pm_runtime_disable(dev);
--
-       phy_power_on(gmac, false);
-       gmac_clk_enable(gmac, false);
- }
--- 
-2.30.2
-

diff --git a/queue-5.13/series b/queue-5.13/series
index 56695f4748e7063126c2cbb5c9832b782d4dd408..5076c53227cf19e3c9cea0e45e4fc9f3d0128647 100644 (file)
--- a/queue-5.13/series
+++ b/queue-5.13/series
@@ -49,7 +49,6 @@ ip_gre-add-validation-for-csum_start.patch
 xgene-v2-fix-a-resource-leak-in-the-error-handling-p.patch
 net-marvell-fix-mvneta_tx_in_prgrs-bit-number.patch
 ucounts-increase-ucounts-reference-counter-before-th.patch
-net-stmmac-dwmac-rk-fix-unbalanced-pm_runtime_enable.patch
 net-sched-ets-fix-crash-when-flipping-from-strict-to.patch
 sunrpc-fix-xpt_busy-flag-leakage-in-svc_handle_xprt.patch
 ipv6-use-siphash-in-rt6_exception_hash.patch