aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/sfc/efx.c
diff options
context:
space:
mode:
authorBen Hutchings <bhutchings@solarflare.com>2009-10-23 08:31:37 +0000
committerDavid S. Miller <davem@davemloft.net>2009-10-24 04:27:12 -0700
commitf01865f0649f3d42b70fec8968adfd53734a3380 (patch)
tree8a60daa658ee4df2eb6defdd138a00ef81e35bf5 /drivers/net/sfc/efx.c
parentsfc: Merge struct efx_blinker into struct efx_board (diff)
downloadlinux-dev-f01865f0649f3d42b70fec8968adfd53734a3380.tar.xz
linux-dev-f01865f0649f3d42b70fec8968adfd53734a3380.zip
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>
Diffstat (limited to 'drivers/net/sfc/efx.c')
-rw-r--r--drivers/net/sfc/efx.c2
1 files changed, 1 insertions, 1 deletions
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);