Browse Source

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>
Ben Hutchings 13 years ago
parent
commit
bdca71ede7
2 changed files with 1 additions and 6 deletions
  1. 0 4
      drivers/net/ethernet/sfc/nic.h
  2. 1 2
      drivers/net/ethernet/sfc/siena.c

+ 0 - 4
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)
 {

+ 1 - 2
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);