diff options
| author | Heiner Kallweit <hkallweit1@gmail.com> | 2020-06-17 22:55:40 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-06-19 05:38:36 +0200 |
| commit | 9f0b54cd167219266bd3864570ae8f4987b57520 (patch) | |
| tree | bd7f9e22d24a4646871ed85b51cefb4695785608 | |
| parent | r8169: move updating counters to rtl8169_down (diff) | |
| download | linux-9f0b54cd167219266bd3864570ae8f4987b57520.tar.xz linux-9f0b54cd167219266bd3864570ae8f4987b57520.zip | |
r8169: move switching optional clock on/off to pll power functions
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>
| -rw-r--r-- | drivers/net/ethernet/realtek/r8169_main.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c index 9f99b3f076d8..d55bf2cd2651 100644 --- a/drivers/net/ethernet/realtek/r8169_main.c +++ b/drivers/net/ethernet/realtek/r8169_main.c @@ -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: @@ -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; } @@ -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); |