diff options
| author |   Heiner Kallweit <hkallweit1@gmail.com> | 2019-01-31 22:03:48 +0100 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2019-02-02 19:45:36 -0800 |
| commit | 5ea25b125289ed1d77da736a5d511a7d01f4bfb6 (patch) | |
| tree | 6e7ed2049d01d28dde793f2f0bafd08dbc1202f5 /drivers/net/ethernet/realtek/r8169.c | |
| parent | Merge branch 'hns3-next' (diff) | |
| download | linux-dev-5ea25b125289ed1d77da736a5d511a7d01f4bfb6.tar.xz linux-dev-5ea25b125289ed1d77da736a5d511a7d01f4bfb6.zip | |
r8169: remove rtl_wol_pll_power_down
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | drivers/net/ethernet/realtek/r8169.c | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c index 9dc68981751b..e8a112149a62 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: |