diff options
| author |   Ben Hutchings <bhutchings@solarflare.com> | 2009-10-23 08:33:00 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2009-10-24 04:27:23 -0700 |
| commit | 2ed380a59b3725dc5fbda3627792172afbefc8eb (patch) | |
| tree | 27574764f03747b831072d8d14c033a23c1d5fc3 /drivers/net/sfc/efx.c | |
| parent | sfc: Remove incorrect assertion from efx_pci_remove_main() (diff) | |
| download | linux-dev-2ed380a59b3725dc5fbda3627792172afbefc8eb.tar.xz linux-dev-2ed380a59b3725dc5fbda3627792172afbefc8eb.zip | |
sfc: Remove unnecessary tests of efx->membase
These cleanup functions will never be called if the MMIO region could
not be mapped.
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.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/net/sfc/efx.c b/drivers/net/sfc/efx.c index c9258017632c..8fc6a6edc362 100644 --- a/drivers/net/sfc/efx.c +++ b/drivers/net/sfc/efx.c @@ -2022,10 +2022,6 @@ static void efx_fini_struct(struct efx_nic *efx) */ static void efx_pci_remove_main(struct efx_nic *efx) { - /* Skip everything if we never obtained a valid membase */ - if (!efx->membase) - return; - falcon_fini_interrupt(efx); efx_fini_channels(efx); efx_fini_port(efx); @@ -2056,9 +2052,6 @@ static void efx_pci_remove(struct pci_dev *pci_dev) /* Allow any queued efx_resets() to complete */ rtnl_unlock(); - if (efx->membase == NULL) - goto out; - efx_unregister_netdev(efx); efx_mtd_remove(efx); @@ -2071,7 +2064,6 @@ static void efx_pci_remove(struct pci_dev *pci_dev) efx_pci_remove_main(efx); -out: efx_fini_io(efx); EFX_LOG(efx, "shutdown successful\n"); |