aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/ethernet/sfc/nic.h4
-rw-r--r--drivers/net/ethernet/sfc/siena.c3
2 files changed, 1 insertions, 6 deletions
diff --git a/drivers/net/ethernet/sfc/nic.h b/drivers/net/ethernet/sfc/nic.h
index 246c4140453c..ac12f7f7f35b 100644
--- a/drivers/net/ethernet/sfc/nic.h
+++ b/drivers/net/ethernet/sfc/nic.h
@@ -35,10 +35,6 @@ static inline int efx_nic_rev(struct efx_nic *efx)
35 35
36extern u32 efx_nic_fpga_ver(struct efx_nic *efx); 36extern u32 efx_nic_fpga_ver(struct efx_nic *efx);
37 37
38static inline bool efx_nic_has_mc(struct efx_nic *efx)
39{
40 return efx_nic_rev(efx) >= EFX_REV_SIENA_A0;
41}
42/* NIC has two interlinked PCI functions for the same port. */ 38/* NIC has two interlinked PCI functions for the same port. */
43static inline bool efx_nic_is_dual_func(struct efx_nic *efx) 39static inline bool efx_nic_is_dual_func(struct efx_nic *efx)
44{ 40{
diff --git a/drivers/net/ethernet/sfc/siena.c b/drivers/net/ethernet/sfc/siena.c
index 7bea79017a05..9f8d7cea3967 100644
--- a/drivers/net/ethernet/sfc/siena.c
+++ b/drivers/net/ethernet/sfc/siena.c
@@ -409,8 +409,7 @@ static void siena_remove_nic(struct efx_nic *efx)
409 siena_reset_hw(efx, RESET_TYPE_ALL); 409 siena_reset_hw(efx, RESET_TYPE_ALL);
410 410
411 /* Relinquish the device back to the BMC */ 411 /* Relinquish the device back to the BMC */
412 if (efx_nic_has_mc(efx)) 412 efx_mcdi_drv_attach(efx, false, NULL);
413 efx_mcdi_drv_attach(efx, false, NULL);
414 413
415 /* Tear down the private nic state */ 414 /* Tear down the private nic state */
416 kfree(efx->nic_data); 415 kfree(efx->nic_data);