Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 92bad850 authored by Heiner Kallweit's avatar Heiner Kallweit Committed by David S. Miller
Browse files

r8169: improve phy initialization when resuming 



Let's move calling rtl8169_init_phy() to __rtl8169_resume().
It simplifies the code and avoids rtl8169_init_phy() being called
when resuming whilst interface is down. rtl_open() will initialize
the PHY when the interface is brought up.

Signed-off-by: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 064f3902

drivers/net/ethernet/realtek/r8169.c

+1 −5
Original line number Diff line number Diff line
@@ -7334,6 +7334,7 @@ static void __rtl8169_resume(struct net_device *dev) 
	netif_device_attach(dev);



	rtl_pll_power_up(tp);

	rtl8169_init_phy(dev, tp);



	rtl_lock_work(tp);

	napi_enable(&tp->napi);
@@ -7347,9 +7348,6 @@ static int rtl8169_resume(struct device *device) 
{

	struct pci_dev *pdev = to_pci_dev(device);

	struct net_device *dev = pci_get_drvdata(pdev);

	struct rtl8169_private *tp = netdev_priv(dev);



	rtl8169_init_phy(dev, tp);



	if (netif_running(dev))

		__rtl8169_resume(dev);
@@ -7397,8 +7395,6 @@ static int rtl8169_runtime_resume(struct device *device) 
	tp->saved_wolopts = 0;

	rtl_unlock_work(tp);



	rtl8169_init_phy(dev, tp);



	__rtl8169_resume(dev);



	return 0;