From: Fugang Duan <b38611@freescale.com>
Date: Tue, 14 Oct 2014 08:44:57 +0000 (+0800)
Subject: MLK-9691 net: fec: call .pm_qos_remove_request() in .ndo_stop() callback
X-Git-Tag: C0P2-H0.0--20200415~4791
X-Git-Url: https://git.somdevices.com/?a=commitdiff_plain;h=fd490241f3193e3189e28c88f50f07f79adb74b7;p=linux.git

MLK-9691 net: fec: call .pm_qos_remove_request() in .ndo_stop() callback

Call .pm_qos_remove_request() in .ndo_stop() callback to avoid kernel
warning during enet open/close test.

Signed-off-by: Fugang Duan <B38611@freescale.com>
(cherry picked from commit: f81c176d36b8189220a729d723801d2cdd495108)
---

diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c
index eb88a3d6ed48..0cbf188bc644 100644
--- a/drivers/net/ethernet/freescale/fec_main.c
+++ b/drivers/net/ethernet/freescale/fec_main.c
@@ -2933,6 +2933,7 @@ fec_enet_close(struct net_device *ndev)
 	fec_enet_update_ethtool_stats(ndev);
 
 	fec_enet_clk_enable(ndev, false);
+	pm_qos_remove_request(&fep->pm_qos_req);
 	pinctrl_pm_select_sleep_state(&fep->pdev->dev);
 	pm_runtime_mark_last_busy(&fep->pdev->dev);
 	pm_runtime_put_autosuspend(&fep->pdev->dev);