From 5c4e1d187442c07b8bcbb7097a70e65e8b187598 Mon Sep 17 00:00:00 2001 From: Michal Schmidt Date: Fri, 27 Oct 2023 10:59:39 -0700 Subject: iavf: use unregister_netdev Use unregister_netdev, which takes rtnl_lock for us. We don't have to check the reg_state under rtnl_lock. There's nothing to race with. We have just cancelled the finish_config work. Signed-off-by: Michal Schmidt Reviewed-by: Wojciech Drewek Reviewed-by: Jacob Keller Signed-off-by: Jacob Keller Link: https://lore.kernel.org/r/20231027175941.1340255-7-jacob.e.keller@intel.com Signed-off-by: Jakub Kicinski --- drivers/net/ethernet/intel/iavf/iavf_main.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/net/ethernet/intel/iavf/iavf_main.c b/drivers/net/ethernet/intel/iavf/iavf_main.c index b6fe42547cc3..8a7edeb8f12c 100644 --- a/drivers/net/ethernet/intel/iavf/iavf_main.c +++ b/drivers/net/ethernet/intel/iavf/iavf_main.c @@ -5167,10 +5167,8 @@ static void iavf_remove(struct pci_dev *pdev) cancel_delayed_work_sync(&adapter->watchdog_task); cancel_work_sync(&adapter->finish_config); - rtnl_lock(); if (netdev->reg_state == NETREG_REGISTERED) - unregister_netdevice(netdev); - rtnl_unlock(); + unregister_netdev(netdev); if (CLIENT_ALLOWED(adapter)) { err = iavf_lan_del_device(adapter); -- cgit v1.2.3