openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

r8169: improve rtl8169_runtime_resume 

Simplify rtl8169_runtime_resume() by calling rtl8169_resume().

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Heiner Kallweit 2020-06-20 22:39:35 +02:00 committed by David S. Miller
parent 06a14ab852
commit 288302dab3
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/net/ethernet/realtek/r8169_main.c
View File

@ -4758,13 +4758,13 @@ static int __maybe_unused rtl8169_suspend(struct device *device)
return 0;
}
static int __maybe_unused rtl8169_resume(struct device *device)
static int rtl8169_resume(struct device *device)
{
struct rtl8169_private *tp = dev_get_drvdata(device);
rtl_rar_set(tp, tp->dev->dev_addr);
if (netif_running(tp->dev))
if (tp->TxDescArray)
rtl8169_up(tp);
netif_device_attach(tp->dev);
@ -4793,16 +4793,9 @@ static int rtl8169_runtime_resume(struct device *device)
{
struct rtl8169_private *tp = dev_get_drvdata(device);
rtl_rar_set(tp, tp->dev->dev_addr);
__rtl8169_set_wol(tp, tp->saved_wolopts);
if (tp->TxDescArray)
rtl8169_up(tp);
netif_device_attach(tp->dev);
return 0;
return rtl8169_resume(device);
}
static int rtl8169_runtime_idle(struct device *device)