diff mbox

staging: rtl8723au: core: rtw_mlme: Removed variables that is never used

Message ID 1422716329-3718-1-git-send-email-rickard_strandqvist@spectrumdigital.se (mailing list archive)
State Not Applicable
Headers show

Commit Message

Rickard Strandqvist Jan. 31, 2015, 2:58 p.m. UTC
Variable was assigned a value that was never used.
I have also removed all the code that thereby serves no purpose.

This was found using a static code analysis program called cppcheck

Signed-off-by: Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
---
 drivers/staging/rtl8723au/core/rtw_mlme.c |   21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

Comments

Jes Sorensen Feb. 1, 2015, 11:02 p.m. UTC | #1
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se> writes:
> Variable was assigned a value that was never used.
> I have also removed all the code that thereby serves no purpose.
>
> This was found using a static code analysis program called cppcheck
>
> Signed-off-by: Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
> ---
>  drivers/staging/rtl8723au/core/rtw_mlme.c |   21 ++++++++++-----------
>  1 file changed, 10 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/staging/rtl8723au/core/rtw_mlme.c b/drivers/staging/rtl8723au/core/rtw_mlme.c
> index 7299ef0..8b2db4b 100644
> --- a/drivers/staging/rtl8723au/core/rtw_mlme.c
> +++ b/drivers/staging/rtl8723au/core/rtw_mlme.c
> @@ -2123,7 +2123,6 @@ bool rtw_restructure_ht_ie23a(struct rtw_adapter *padapter, u8 *in_ie,
>  {
>  	u32 out_len;
>  	int max_rx_ampdu_factor;
> -	unsigned char *pframe;
>  	const u8 *p;
>  	struct ieee80211_ht_cap ht_capie;
>  	u8 WMM_IE[7] = {0x00, 0x50, 0xf2, 0x02, 0x00, 0x01, 0x00};
> @@ -2139,10 +2138,10 @@ bool rtw_restructure_ht_ie23a(struct rtw_adapter *padapter, u8 *in_ie,
>  
>  		if (pmlmepriv->qos_option == 0) {
>  			out_len = *pout_len;
> -			pframe = rtw_set_ie23a(out_ie + out_len,
> -					       WLAN_EID_VENDOR_SPECIFIC,
> -					       sizeof(WMM_IE), WMM_IE,
> -					       pout_len);
> +			rtw_set_ie23a(out_ie + out_len,
> +						WLAN_EID_VENDOR_SPECIFIC,
> +						sizeof(WMM_IE), WMM_IE,
> +						pout_len);

And again here - do it properly, please.

Jes
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Rickard Strandqvist Feb. 1, 2015, 11:18 p.m. UTC | #2
2015-02-02 0:02 GMT+01:00 Jes Sorensen <Jes.Sorensen@redhat.com>:
> Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se> writes:
>> Variable was assigned a value that was never used.
>> I have also removed all the code that thereby serves no purpose.
>>
>> This was found using a static code analysis program called cppcheck
>>
>> Signed-off-by: Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
>> ---
>>  drivers/staging/rtl8723au/core/rtw_mlme.c |   21 ++++++++++-----------
>>  1 file changed, 10 insertions(+), 11 deletions(-)
>>
>> diff --git a/drivers/staging/rtl8723au/core/rtw_mlme.c b/drivers/staging/rtl8723au/core/rtw_mlme.c
>> index 7299ef0..8b2db4b 100644
>> --- a/drivers/staging/rtl8723au/core/rtw_mlme.c
>> +++ b/drivers/staging/rtl8723au/core/rtw_mlme.c
>> @@ -2123,7 +2123,6 @@ bool rtw_restructure_ht_ie23a(struct rtw_adapter *padapter, u8 *in_ie,
>>  {
>>       u32 out_len;
>>       int max_rx_ampdu_factor;
>> -     unsigned char *pframe;
>>       const u8 *p;
>>       struct ieee80211_ht_cap ht_capie;
>>       u8 WMM_IE[7] = {0x00, 0x50, 0xf2, 0x02, 0x00, 0x01, 0x00};
>> @@ -2139,10 +2138,10 @@ bool rtw_restructure_ht_ie23a(struct rtw_adapter *padapter, u8 *in_ie,
>>
>>               if (pmlmepriv->qos_option == 0) {
>>                       out_len = *pout_len;
>> -                     pframe = rtw_set_ie23a(out_ie + out_len,
>> -                                            WLAN_EID_VENDOR_SPECIFIC,
>> -                                            sizeof(WMM_IE), WMM_IE,
>> -                                            pout_len);
>> +                     rtw_set_ie23a(out_ie + out_len,
>> +                                             WLAN_EID_VENDOR_SPECIFIC,
>> +                                             sizeof(WMM_IE), WMM_IE,
>> +                                             pout_len);
>
> And again here - do it properly, please.
>
> Jes

Hi Jes

I am sorry, please ignore this.
I will not send any more patches.

Kind regards
Rickard Strandqvist
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/staging/rtl8723au/core/rtw_mlme.c b/drivers/staging/rtl8723au/core/rtw_mlme.c
index 7299ef0..8b2db4b 100644
--- a/drivers/staging/rtl8723au/core/rtw_mlme.c
+++ b/drivers/staging/rtl8723au/core/rtw_mlme.c
@@ -2123,7 +2123,6 @@  bool rtw_restructure_ht_ie23a(struct rtw_adapter *padapter, u8 *in_ie,
 {
 	u32 out_len;
 	int max_rx_ampdu_factor;
-	unsigned char *pframe;
 	const u8 *p;
 	struct ieee80211_ht_cap ht_capie;
 	u8 WMM_IE[7] = {0x00, 0x50, 0xf2, 0x02, 0x00, 0x01, 0x00};
@@ -2139,10 +2138,10 @@  bool rtw_restructure_ht_ie23a(struct rtw_adapter *padapter, u8 *in_ie,
 
 		if (pmlmepriv->qos_option == 0) {
 			out_len = *pout_len;
-			pframe = rtw_set_ie23a(out_ie + out_len,
-					       WLAN_EID_VENDOR_SPECIFIC,
-					       sizeof(WMM_IE), WMM_IE,
-					       pout_len);
+			rtw_set_ie23a(out_ie + out_len,
+						WLAN_EID_VENDOR_SPECIFIC,
+						sizeof(WMM_IE), WMM_IE,
+						pout_len);
 
 			pmlmepriv->qos_option = 1;
 		}
@@ -2172,18 +2171,18 @@  bool rtw_restructure_ht_ie23a(struct rtw_adapter *padapter, u8 *in_ie,
 			ht_capie.ampdu_params_info |=
 				(IEEE80211_HT_AMPDU_PARM_DENSITY & 0x00);
 
-		pframe = rtw_set_ie23a(out_ie + out_len, WLAN_EID_HT_CAPABILITY,
-				    sizeof(struct ieee80211_ht_cap),
-				    (unsigned char *)&ht_capie, pout_len);
+		rtw_set_ie23a(out_ie + out_len, WLAN_EID_HT_CAPABILITY,
+				sizeof(struct ieee80211_ht_cap),
+				(unsigned char *)&ht_capie, pout_len);
 
 		phtpriv->ht_option = true;
 
 		p = cfg80211_find_ie(WLAN_EID_HT_OPERATION, in_ie, in_len);
 		if (p && (p[1] == sizeof(struct ieee80211_ht_operation))) {
 			out_len = *pout_len;
-			pframe = rtw_set_ie23a(out_ie + out_len,
-					       WLAN_EID_HT_OPERATION,
-					       p[1], p + 2 , pout_len);
+			rtw_set_ie23a(out_ie + out_len,
+					WLAN_EID_HT_OPERATION,
+					p[1], p + 2, pout_len);
 		}
 	}