iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

r8169: make rtl8169_down central chip quiesce function

Browse Source 
Functionality for quiescing the chip is spread across different
functions currently. Move it to rtl8169_down().

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-05-30 23:58:35 +02:00 committed by David S. Miller
parent bac75d8565
commit 8ac8e8c64b
1 changed files with 11 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4627,20 +4627,21 @@ static int r8169_phy_connect(struct rtl8169_private *tp)
return 0; return 0;
} }
static void rtl8169_down(struct net_device *dev) static void rtl8169_down(struct rtl8169_private *tp)
{ {
struct rtl8169_private *tp = netdev_priv(dev); rtl_lock_work(tp);
/* Clear all task flags */
bitmap_zero(tp->wk.flags, RTL_FLAG_MAX);
phy_stop(tp->phydev); phy_stop(tp->phydev);
napi_disable(&tp->napi); napi_disable(&tp->napi);
netif_stop_queue(dev);
rtl8169_hw_reset(tp); rtl8169_hw_reset(tp);
rtl8169_rx_clear(tp);
rtl_pll_power_down(tp); rtl_pll_power_down(tp);
rtl_unlock_work(tp);
} }
static int rtl8169_close(struct net_device *dev) static int rtl8169_close(struct net_device *dev)
@ -4653,12 +4654,9 @@ static int rtl8169_close(struct net_device *dev)
/* Update counters before going down */ /* Update counters before going down */
rtl8169_update_counters(tp); rtl8169_update_counters(tp);
rtl_lock_work(tp); netif_stop_queue(dev);
/* Clear all task flags */ rtl8169_down(tp);
bitmap_zero(tp->wk.flags, RTL_FLAG_MAX); rtl8169_rx_clear(tp);
rtl8169_down(dev);
rtl_unlock_work(tp);
cancel_work_sync(&tp->wk.work); cancel_work_sync(&tp->wk.work);
@ -4817,17 +4815,8 @@ static void rtl8169_net_suspend(struct rtl8169_private *tp)
if (!netif_running(tp->dev)) if (!netif_running(tp->dev))
return; return;
phy_stop(tp->phydev);
netif_device_detach(tp->dev); netif_device_detach(tp->dev);
rtl8169_down(tp);
rtl_lock_work(tp);
napi_disable(&tp->napi);
/* Clear all task flags */
bitmap_zero(tp->wk.flags, RTL_FLAG_MAX);
rtl_unlock_work(tp);
rtl_pll_power_down(tp);
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM