diff options
author | Ben Hutchings <bhutchings@solarflare.com> | 2009-10-23 04:33:00 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-10-24 07:27:23 -0400 |
commit | 2ed380a59b3725dc5fbda3627792172afbefc8eb (patch) | |
tree | 27574764f03747b831072d8d14c033a23c1d5fc3 /drivers | |
parent | be4b163b28917499ea1f8755eee8509ee2675ec3 (diff) |
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')
-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) | |||
2022 | */ | 2022 | */ |
2023 | static void efx_pci_remove_main(struct efx_nic *efx) | 2023 | static void efx_pci_remove_main(struct efx_nic *efx) |
2024 | { | 2024 | { |
2025 | /* Skip everything if we never obtained a valid membase */ | ||
2026 | if (!efx->membase) | ||
2027 | return; | ||
2028 | |||
2029 | falcon_fini_interrupt(efx); | 2025 | falcon_fini_interrupt(efx); |
2030 | efx_fini_channels(efx); | 2026 | efx_fini_channels(efx); |
2031 | efx_fini_port(efx); | 2027 | efx_fini_port(efx); |
@@ -2056,9 +2052,6 @@ static void efx_pci_remove(struct pci_dev *pci_dev) | |||
2056 | /* Allow any queued efx_resets() to complete */ | 2052 | /* Allow any queued efx_resets() to complete */ |
2057 | rtnl_unlock(); | 2053 | rtnl_unlock(); |
2058 | 2054 | ||
2059 | if (efx->membase == NULL) | ||
2060 | goto out; | ||
2061 | |||
2062 | efx_unregister_netdev(efx); | 2055 | efx_unregister_netdev(efx); |
2063 | 2056 | ||
2064 | efx_mtd_remove(efx); | 2057 | efx_mtd_remove(efx); |
@@ -2071,7 +2064,6 @@ static void efx_pci_remove(struct pci_dev *pci_dev) | |||
2071 | 2064 | ||
2072 | efx_pci_remove_main(efx); | 2065 | efx_pci_remove_main(efx); |
2073 | 2066 | ||
2074 | out: | ||
2075 | efx_fini_io(efx); | 2067 | efx_fini_io(efx); |
2076 | EFX_LOG(efx, "shutdown successful\n"); | 2068 | EFX_LOG(efx, "shutdown successful\n"); |
2077 | 2069 | ||