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 8b67553046e82a05871ba50aa4db55c9149d63ae..862e4832f614a81aa83a464531b70efaa22b584c 100644 (file)
--- 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);