提交 7257c977 编写于 作者: H Heiner Kallweit 提交者: Jakub Kicinski

r8169: clean up rtl_pll_power_down/up functions

Clean up the remainings of rtl_pll_power_down/up and rename
rtl_pll_power_down() to rtl_prepare_power_down().
Signed-off-by: NHeiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: NJakub Kicinski <kuba@kernel.org>
上级 128735a1
...@@ -2229,7 +2229,7 @@ static void rtl_wol_suspend_quirk(struct rtl8169_private *tp) ...@@ -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) ...@@ -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) ...@@ -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);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册