From: Ben Hutchings <bhutchings@solarflare.com>
Date: Fri, 23 Oct 2009 08:31:37 +0000 (+0000)
Subject: sfc: Change order of device removal to reverse of probe order
X-Git-Tag: firefly_0821_release~9833^2~3968^2~725
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=f01865f0649f3d42b70fec8968adfd53734a3380;p=firefly-linux-kernel-4.4.55.git

sfc: Change order of device removal to reverse of probe order

This makes efx_pci_remove_main() more obviously the inverse of
efx_pci_probe_main(), and matches our out-of-tree driver.

Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/drivers/net/sfc/efx.c b/drivers/net/sfc/efx.c
index 8b67553046e8..862e4832f614 100644
--- a/drivers/net/sfc/efx.c
+++ b/drivers/net/sfc/efx.c
@@ -2025,12 +2025,12 @@ static void efx_pci_remove_main(struct efx_nic *efx)
 	if (!efx->membase)
 		return;
 
+	falcon_fini_interrupt(efx);
 	efx_fini_channels(efx);
 	efx_fini_port(efx);
 
 	/* Shutdown the board, then the NIC and board state */
 	efx->board_info.fini(efx);
-	falcon_fini_interrupt(efx);
 
 	efx_fini_napi(efx);
 	efx_remove_all(efx);