]> git.baikalelectronics.ru Git - kernel.git/commitdiff
r8169: clean up rtl_pll_power_down/up functions
authorHeiner Kallweit <hkallweit1@gmail.com>
Sun, 10 Jan 2021 19:50:57 +0000 (20:50 +0100)
committerJakub Kicinski <kuba@kernel.org>
Tue, 12 Jan 2021 01:01:17 +0000 (17:01 -0800)
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>
drivers/net/ethernet/realtek/r8169_main.c

index 64fdc168fc693162fa9d38a52389859750a0efec..33336098b1e56e60c70f3cdae62a6758740c2194 100644 (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))
                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)
 {
        switch (tp->mac_version) {
@@ -4604,12 +4599,12 @@ static void rtl8169_down(struct rtl8169_private *tp)
 
        rtl8169_cleanup(tp, true);
 
-       rtl_pll_power_down(tp);
+       rtl_prepare_power_down(tp);
 }
 
 static void rtl8169_up(struct rtl8169_private *tp)
 {
-       rtl_pll_power_up(tp);
+       phy_resume(tp->phydev);
        rtl8169_init_phy(tp);
        napi_enable(&tp->napi);
        set_bit(RTL_FLAG_TASK_ENABLED, tp->wk.flags);