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>
This commit is contained in:
Родитель
be4b163b28
Коммит
2ed380a59b
|
@ -2022,10 +2022,6 @@ static void efx_fini_struct(struct efx_nic *efx)
|
||||||
*/
|
*/
|
||||||
static void efx_pci_remove_main(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);
|
falcon_fini_interrupt(efx);
|
||||||
efx_fini_channels(efx);
|
efx_fini_channels(efx);
|
||||||
efx_fini_port(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 */
|
/* Allow any queued efx_resets() to complete */
|
||||||
rtnl_unlock();
|
rtnl_unlock();
|
||||||
|
|
||||||
if (efx->membase == NULL)
|
|
||||||
goto out;
|
|
||||||
|
|
||||||
efx_unregister_netdev(efx);
|
efx_unregister_netdev(efx);
|
||||||
|
|
||||||
efx_mtd_remove(efx);
|
efx_mtd_remove(efx);
|
||||||
|
@ -2071,7 +2064,6 @@ static void efx_pci_remove(struct pci_dev *pci_dev)
|
||||||
|
|
||||||
efx_pci_remove_main(efx);
|
efx_pci_remove_main(efx);
|
||||||
|
|
||||||
out:
|
|
||||||
efx_fini_io(efx);
|
efx_fini_io(efx);
|
||||||
EFX_LOG(efx, "shutdown successful\n");
|
EFX_LOG(efx, "shutdown successful\n");
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче