From 12b1bc75cd460c30652db0d4a3bd3fc59c16742c Mon Sep 17 00:00:00 2001
From: Heiner Kallweit <hkallweit1@gmail.com>
Date: Mon, 25 May 2020 21:54:00 +0200
Subject: [PATCH] r8169: improve rtl_remove_one
Git-commit: 12b1bc75cd460c30652db0d4a3bd3fc59c16742c
Patch-mainline: v5.8-rc1
References: bsc#1175746
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>
Acked-by: Takashi Iwai <tiwai@suse.de>
---
drivers/net/ethernet/realtek/r8169_main.c | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
--- a/drivers/net/ethernet/realtek/r8169_main.c
+++ b/drivers/net/ethernet/realtek/r8169_main.c
@@ -5024,18 +5024,16 @@ static void rtl_remove_one(struct pci_de
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);
mdiobus_unregister(tp->phydev->mdio.bus);
- 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);