diff mbox series

iwlwifi: mvm: remove set but not used variable 'he_phy_data'

Message ID 1538736421-97401-1-git-send-email-yuehaibing@huawei.com
State Awaiting Upstream, archived
Delegated to: David Miller
Headers show
Series iwlwifi: mvm: remove set but not used variable 'he_phy_data' | expand

Commit Message

Yue Haibing Oct. 5, 2018, 10:47 a.m. UTC
Fixes gcc '-Wunused-but-set-variable' warning:

drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c: In function 'iwl_mvm_rx_mpdu_mq':
drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c:1386:7: warning:
 variable 'he_phy_data' set but not used [-Wunused-but-set-variable]
   u64 he_phy_data;
   
'he_phy_data' never used since be introduce in
commit 18ead597daa1 ("iwlwifi: support new rx_mpdu_desc api")

Signed-off-by: YueHaibing <yuehaibing@huawei.com>
---
 drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c | 6 ------
 1 file changed, 6 deletions(-)

Comments

Coelho, Luciano Oct. 17, 2018, 7:16 a.m. UTC | #1
On Fri, 2018-10-05 at 10:47 +0000, YueHaibing wrote:
> Fixes gcc '-Wunused-but-set-variable' warning:
> 
> drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c: In function
> 'iwl_mvm_rx_mpdu_mq':
> drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c:1386:7: warning:
>  variable 'he_phy_data' set but not used [-Wunused-but-set-variable]
>    u64 he_phy_data;
>    
> 'he_phy_data' never used since be introduce in
> commit 18ead597daa1 ("iwlwifi: support new rx_mpdu_desc api")
> 
> Signed-off-by: YueHaibing <yuehaibing@huawei.com>
> ---

Thanks, Yue! This was a merge damage when I applied the HE patches for
iwlwifi.

I've queued this and will send it out as part of the series for 4.21. 
Then it will trickle down as needed.

--
Cheers,
Luca.
diff mbox series

Patch

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c b/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c
index 894dd63..7eaa586 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c
@@ -1383,12 +1383,6 @@  void iwl_mvm_rx_mpdu_mq(struct iwl_mvm *mvm, struct napi_struct *napi,
 	/* update aggregation data for monitor sake on default queue */
 	if (!queue && (phy_info & IWL_RX_MPDU_PHY_AMPDU)) {
 		bool toggle_bit = phy_info & IWL_RX_MPDU_PHY_AMPDU_TOGGLE;
-		u64 he_phy_data;
-
-		if (mvm->trans->cfg->device_family >= IWL_DEVICE_FAMILY_22560)
-			he_phy_data = le64_to_cpu(desc->v3.he_phy_data);
-		else
-			he_phy_data = le64_to_cpu(desc->v1.he_phy_data);
 
 		rx_status->flag |= RX_FLAG_AMPDU_DETAILS;
 		rx_status->ampdu_reference = mvm->ampdu_ref;