Skip to content

Commit

Permalink
r8169: move switching optional clock on/off to pll power functions
Browse files Browse the repository at this point in the history
Relevant chip clocks are disabled in rtl_pll_power_down(), therefore
move calling clk_disable_unprepare() there. Similar for enabling the
clock.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Heiner Kallweit authored and David S. Miller committed Jun 19, 2020
1 parent a2ee847 commit 9f0b54c
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions drivers/net/ethernet/realtek/r8169_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -2292,10 +2292,14 @@ static void rtl_pll_power_down(struct rtl8169_private *tp)
default:
break;
}

clk_disable_unprepare(tp->clk);
}

static void rtl_pll_power_up(struct rtl8169_private *tp)
{
clk_prepare_enable(tp->clk);

switch (tp->mac_version) {
case RTL_GIGA_MAC_VER_25 ... RTL_GIGA_MAC_VER_33:
case RTL_GIGA_MAC_VER_37:
Expand Down Expand Up @@ -4826,7 +4830,6 @@ static int __maybe_unused rtl8169_suspend(struct device *device)
struct rtl8169_private *tp = dev_get_drvdata(device);

rtl8169_net_suspend(tp);
clk_disable_unprepare(tp->clk);

return 0;
}
Expand All @@ -4853,8 +4856,6 @@ static int __maybe_unused rtl8169_resume(struct device *device)

rtl_rar_set(tp, tp->dev->dev_addr);

clk_prepare_enable(tp->clk);

if (netif_running(tp->dev))
__rtl8169_resume(tp);

Expand Down

0 comments on commit 9f0b54c

Please sign in to comment.