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

r8169: improve rtl_remove_one 

Don't call netif_napi_del() manually, free_netdev() does this for us.
In addition reorder calls to match reverse order of calls in probe().

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-25 21:54:00 +02:00 committed by David S. Miller
parent 394fe485f8
commit 12b1bc75cd
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4996,17 +4996,15 @@ static void rtl_remove_one(struct pci_dev *pdev)
struct net_device *dev = pci_get_drvdata(pdev);
struct rtl8169_private *tp = netdev_priv(dev);
if (r8168_check_dash(tp))
rtl8168_driver_stop(tp);
netif_napi_del(&tp->napi);
if (pci_dev_run_wake(pdev))
pm_runtime_get_noresume(&pdev->dev);
unregister_netdev(dev);
rtl_release_firmware(tp);
if (r8168_check_dash(tp))
rtl8168_driver_stop(tp);
if (pci_dev_run_wake(pdev))
pm_runtime_get_noresume(&pdev->dev);
rtl_release_firmware(tp);
/* restore original MAC address */
rtl_rar_set(tp, dev->perm_addr);