* [PATCH net-next] r8169: improve rtl_remove_one
@ 2020-05-25 19:54 Heiner Kallweit
2020-05-27 3:27 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Heiner Kallweit @ 2020-05-25 19:54 UTC (permalink / raw)
To: Realtek linux nic maintainers, David Miller, Jakub Kicinski; +Cc: netdev
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>
---
drivers/net/ethernet/realtek/r8169_main.c | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c
index 17c564457..d672ae77c 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);
--
2.26.2
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH net-next] r8169: improve rtl_remove_one
2020-05-25 19:54 [PATCH net-next] r8169: improve rtl_remove_one Heiner Kallweit
@ 2020-05-27 3:27 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2020-05-27 3:27 UTC (permalink / raw)
To: hkallweit1; +Cc: nic_swsd, kuba, netdev
From: Heiner Kallweit <hkallweit1@gmail.com>
Date: Mon, 25 May 2020 21:54:00 +0200
> 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>
Applied, thanks Heiner.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-05-27 3:27 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-25 19:54 [PATCH net-next] r8169: improve rtl_remove_one Heiner Kallweit
2020-05-27 3:27 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).