Skip to content

Commit

Permalink
r8169: clean up rtl_pll_power_down/up functions
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Heiner Kallweit authored and Jakub Kicinski committed Jan 12, 2021
1 parent 128735a commit 7257c97
Showing 1 changed file with 3 additions and 8 deletions.
11 changes: 3 additions & 8 deletions drivers/net/ethernet/realtek/r8169_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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) {
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit 7257c97

Please sign in to comment.