diff options
| author | Heiner Kallweit <hkallweit1@gmail.com> | 2020-05-25 21:54:00 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-05-26 20:27:18 -0700 |
| commit | 12b1bc75cd460c30652db0d4a3bd3fc59c16742c (patch) | |
| tree | b0cd83111a1acef70c348e35ba3c68335819dbf4 | |
| parent | 394fe485f8650afba404a31fe202ec822c243943 (diff) | |
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>
| -rw-r--r-- | drivers/net/ethernet/realtek/r8169_main.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c index 17c564457e52..d672ae77c644 100644 --- a/drivers/net/ethernet/realtek/r8169_main.c +++ b/drivers/net/ethernet/realtek/r8169_main.c @@ -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); |