diff options
| author | Ben Hutchings <bhutchings@solarflare.com> | 2012-02-24 21:29:40 +0000 |
|---|---|---|
| committer | Ben Hutchings <bhutchings@solarflare.com> | 2012-03-06 18:14:13 +0000 |
| commit | bdca71ede7356e4a5838724a0a40be63ac549641 (patch) | |
| tree | 12a98c870fae5f15cc233551c01db023edb46024 | |
| parent | 2c61c8a787fc3382edefd8c7ad3e0f74c81e5302 (diff) | |
| download | op-kernel-dev-bdca71ede7356e4a5838724a0a40be63ac549641.zip op-kernel-dev-bdca71ede7356e4a5838724a0a40be63ac549641.tar.gz | |
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>
| -rw-r--r-- | drivers/net/ethernet/sfc/nic.h | 4 | ||||
| -rw-r--r-- | drivers/net/ethernet/sfc/siena.c | 3 |
2 files changed, 1 insertions, 6 deletions
diff --git a/drivers/net/ethernet/sfc/nic.h b/drivers/net/ethernet/sfc/nic.h index 246c414..ac12f7f 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) 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 7bea790..9f8d7ce 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) 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); |
