diff mbox series

[net-next] r8169: remove rtl_wol_pll_power_down

Message ID 8fbc37cf-c719-1b2e-12c9-ec98c414a130@gmail.com
State Accepted
Delegated to: David Miller
Headers show
Series [net-next] r8169: remove rtl_wol_pll_power_down | expand

Commit Message

Heiner Kallweit Jan. 31, 2019, 9:03 p.m. UTC 
rtl_wol_pll_power_down() is used in only one place and removing it
makes the code simpler and better readable.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
---
 drivers/net/ethernet/realtek/r8169.c | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

Comments

David Miller Feb. 3, 2019, 3:46 a.m. UTC | #1 
From: Heiner Kallweit <hkallweit1@gmail.com>
Date: Thu, 31 Jan 2019 22:03:48 +0100

> rtl_wol_pll_power_down() is used in only one place and removing it
> makes the code simpler and better readable.
> 
> Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>

Applied, thanks Heiner.
diff mbox series

Patch

diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
index 9dc689817..e8a112149 100644
--- a/drivers/net/ethernet/realtek/r8169.c
+++ b/drivers/net/ethernet/realtek/r8169.c
@@ -4247,17 +4247,6 @@  static void rtl_wol_suspend_quirk(struct rtl8169_private *tp)
 	}
 }
 
-static bool rtl_wol_pll_power_down(struct rtl8169_private *tp)
-{
-	if (!device_may_wakeup(tp_to_dev(tp)))
-		return false;
-
-	phy_speed_down(tp->phydev, false);
-	rtl_wol_suspend_quirk(tp);
-
-	return true;
-}
-
 static void r8168_pll_power_down(struct rtl8169_private *tp)
 {
 	if (r8168_check_dash(tp))
@@ -4267,8 +4256,11 @@  static void r8168_pll_power_down(struct rtl8169_private *tp)
 	    tp->mac_version == RTL_GIGA_MAC_VER_33)
 		rtl_ephy_write(tp, 0x19, 0xff64);
 
-	if (rtl_wol_pll_power_down(tp))
+	if (device_may_wakeup(tp_to_dev(tp))) {
+		phy_speed_down(tp->phydev, false);
+		rtl_wol_suspend_quirk(tp);
 		return;
+	}
 
 	switch (tp->mac_version) {
 	case RTL_GIGA_MAC_VER_25 ... RTL_GIGA_MAC_VER_33: