sfc: Remove redundant function efx_nic_has_mc()

This function is now used in only one place, where it always returns
true.

Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>

diff --git a/drivers/net/ethernet/sfc/nic.h b/drivers/net/ethernet/sfc/nic.h
index 246c4140453c5e32cb0fe532b35353a23dda9319..ac12f7f7f35b0c4047298aedcbad75475bac046e 100644 (file)
--- 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)
 
 extern u32 efx_nic_fpga_ver(struct efx_nic *efx);
 
-static inline bool efx_nic_has_mc(struct efx_nic *efx)
-{
-       return efx_nic_rev(efx) >= EFX_REV_SIENA_A0;
-}
 /* NIC has two interlinked PCI functions for the same port. */
 static inline bool efx_nic_is_dual_func(struct efx_nic *efx)
 {

diff --git a/drivers/net/ethernet/sfc/siena.c b/drivers/net/ethernet/sfc/siena.c
index 7bea79017a05b3ccd39ee70c0cce1a7e1f165bb3..9f8d7cea396728b73c893ec277440cd581f07876 100644 (file)
--- 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)
        siena_reset_hw(efx, RESET_TYPE_ALL);
 
        /* Relinquish the device back to the BMC */
-       if (efx_nic_has_mc(efx))
-               efx_mcdi_drv_attach(efx, false, NULL);
+       efx_mcdi_drv_attach(efx, false, NULL);
 
        /* Tear down the private nic state */
        kfree(efx->nic_data);