leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

r8169: clean up rtl_pll_power_down/up functions

Browse Source 
Clean up the remainings of rtl_pll_power_down/up and rename
rtl_pll_power_down() to rtl_prepare_power_down().

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Heiner Kallweit
2021-01-10 20:50:57 +01:00
committed by Jakub Kicinski
parent 128735a153
commit 7257c977c8
1 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/net/ethernet/realtek/r8169_main.c
View File

@@ -2229,7 +2229,7 @@ static void rtl_wol_suspend_quirk(struct rtl8169_private *tp)
} }
} }
static void rtl_pll_power_down(struct rtl8169_private *tp) static void rtl_prepare_power_down(struct rtl8169_private *tp)
{ {
if (r8168_check_dash(tp)) if (r8168_check_dash(tp))
return; return;
@@ -2244,11 +2244,6 @@ static void rtl_pll_power_down(struct rtl8169_private *tp)
} }
} }
static void rtl_pll_power_up(struct rtl8169_private *tp)
{
phy_resume(tp->phydev);
}
static void rtl_init_rxcfg(struct rtl8169_private *tp) static void rtl_init_rxcfg(struct rtl8169_private *tp)
{ {
switch (tp->mac_version) { switch (tp->mac_version) {
@@ -4604,12 +4599,12 @@ static void rtl8169_down(struct rtl8169_private *tp)
rtl8169_cleanup(tp, true); rtl8169_cleanup(tp, true);
rtl_pll_power_down(tp); rtl_prepare_power_down(tp);
} }
static void rtl8169_up(struct rtl8169_private *tp) static void rtl8169_up(struct rtl8169_private *tp)
{ {
rtl_pll_power_up(tp); phy_resume(tp->phydev);
rtl8169_init_phy(tp); rtl8169_init_phy(tp);
napi_enable(&tp->napi); napi_enable(&tp->napi);
set_bit(RTL_FLAG_TASK_ENABLED, tp->wk.flags); set_bit(RTL_FLAG_TASK_ENABLED, tp->wk.flags);