Linux-Wireless Archive on lore.kernel.org
 help / color / Atom feed
* [PATCH 0/3] wireless: Remove unneeded variable
@ 2019-09-12 16:41 zhong jiang
  2019-09-12 16:41 ` [PATCH 1/3] brcmsmac: Remove unneeded variable and make function to be void zhong jiang
                   ` (2 more replies)
  0 siblings, 3 replies; 8+ messages in thread
From: zhong jiang @ 2019-09-12 16:41 UTC (permalink / raw)
  To: kvalo; +Cc: davem, zhongjiang, linux-wireless, netdev, linux-kernel

With the help of Coccinelle, I find some place to use redundant
variable to store the return value, It is unnecessary. Just remove
it and make the funtion to be void.

zhong jiang (3):
  brcmsmac: Remove unneeded variable and make function to be void
  wlegacy: Remove unneeded variable and make function to be void
  libertas: Remove unneeded variable and make function to be void

 drivers/net/wireless/broadcom/brcm80211/brcmsmac/main.c | 5 +----
 drivers/net/wireless/intel/iwlegacy/4965-mac.c          | 8 ++------
 drivers/net/wireless/marvell/libertas/cmd.h             | 2 +-
 drivers/net/wireless/marvell/libertas/cmdresp.c         | 5 +----
 4 files changed, 5 insertions(+), 15 deletions(-)

-- 
1.7.12.4


^ permalink raw reply	[flat|nested] 8+ messages in thread

* [PATCH 1/3] brcmsmac: Remove unneeded variable and make function to be void
  2019-09-12 16:41 [PATCH 0/3] wireless: Remove unneeded variable zhong jiang
@ 2019-09-12 16:41 ` zhong jiang
  2019-09-13 13:37   ` Kalle Valo
  2019-09-12 16:41 ` [PATCH 2/3] wlegacy: " zhong jiang
  2019-09-12 16:41 ` [PATCH 3/3] libertas: " zhong jiang
  2 siblings, 1 reply; 8+ messages in thread
From: zhong jiang @ 2019-09-12 16:41 UTC (permalink / raw)
  To: kvalo; +Cc: davem, zhongjiang, linux-wireless, netdev, linux-kernel

brcms_c_set_mac  do not need return value to cope with different
cases. And change functon return type to void.

Signed-off-by: zhong jiang <zhongjiang@huawei.com>
---
 drivers/net/wireless/broadcom/brcm80211/brcmsmac/main.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/main.c b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/main.c
index 080e829..ddc4d47 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/main.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/main.c
@@ -3776,17 +3776,14 @@ static void brcms_c_set_ps_ctrl(struct brcms_c_info *wlc)
  * Write this BSS config's MAC address to core.
  * Updates RXE match engine.
  */
-static int brcms_c_set_mac(struct brcms_bss_cfg *bsscfg)
+static void brcms_c_set_mac(struct brcms_bss_cfg *bsscfg)
 {
-	int err = 0;
 	struct brcms_c_info *wlc = bsscfg->wlc;
 
 	/* enter the MAC addr into the RXE match registers */
 	brcms_c_set_addrmatch(wlc, RCM_MAC_OFFSET, wlc->pub->cur_etheraddr);
 
 	brcms_c_ampdu_macaddr_upd(wlc);
-
-	return err;
 }
 
 /* Write the BSS config's BSSID address to core (set_bssid in d11procs.tcl).
-- 
1.7.12.4


^ permalink raw reply	[flat|nested] 8+ messages in thread

* [PATCH 2/3] wlegacy: Remove unneeded variable and make function to be void
  2019-09-12 16:41 [PATCH 0/3] wireless: Remove unneeded variable zhong jiang
  2019-09-12 16:41 ` [PATCH 1/3] brcmsmac: Remove unneeded variable and make function to be void zhong jiang
@ 2019-09-12 16:41 ` " zhong jiang
  2019-09-12 17:45   ` Kalle Valo
  2019-09-12 16:41 ` [PATCH 3/3] libertas: " zhong jiang
  2 siblings, 1 reply; 8+ messages in thread
From: zhong jiang @ 2019-09-12 16:41 UTC (permalink / raw)
  To: kvalo; +Cc: davem, zhongjiang, linux-wireless, netdev, linux-kernel

il4965_set_tkip_dynamic_key_info  do not need return value to
cope with different ases. And change functon return type to void.

Signed-off-by: zhong jiang <zhongjiang@huawei.com>
---
 drivers/net/wireless/intel/iwlegacy/4965-mac.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/drivers/net/wireless/intel/iwlegacy/4965-mac.c b/drivers/net/wireless/intel/iwlegacy/4965-mac.c
index ffb705b..a7bbfe2 100644
--- a/drivers/net/wireless/intel/iwlegacy/4965-mac.c
+++ b/drivers/net/wireless/intel/iwlegacy/4965-mac.c
@@ -3326,12 +3326,11 @@ struct il_mod_params il4965_mod_params = {
 	return il_send_add_sta(il, &sta_cmd, CMD_SYNC);
 }
 
-static int
+static void
 il4965_set_tkip_dynamic_key_info(struct il_priv *il,
 				 struct ieee80211_key_conf *keyconf, u8 sta_id)
 {
 	unsigned long flags;
-	int ret = 0;
 	__le16 key_flags = 0;
 
 	key_flags |= (STA_KEY_FLG_TKIP | STA_KEY_FLG_MAP_KEY_MSK);
@@ -3367,8 +3366,6 @@ struct il_mod_params il4965_mod_params = {
 	memcpy(il->stations[sta_id].sta.key.key, keyconf->key, 16);
 
 	spin_unlock_irqrestore(&il->sta_lock, flags);
-
-	return ret;
 }
 
 void
@@ -3483,8 +3480,7 @@ struct il_mod_params il4965_mod_params = {
 		    il4965_set_ccmp_dynamic_key_info(il, keyconf, sta_id);
 		break;
 	case WLAN_CIPHER_SUITE_TKIP:
-		ret =
-		    il4965_set_tkip_dynamic_key_info(il, keyconf, sta_id);
+		il4965_set_tkip_dynamic_key_info(il, keyconf, sta_id);
 		break;
 	case WLAN_CIPHER_SUITE_WEP40:
 	case WLAN_CIPHER_SUITE_WEP104:
-- 
1.7.12.4


^ permalink raw reply	[flat|nested] 8+ messages in thread

* [PATCH 3/3] libertas: Remove unneeded variable and make function to be void
  2019-09-12 16:41 [PATCH 0/3] wireless: Remove unneeded variable zhong jiang
  2019-09-12 16:41 ` [PATCH 1/3] brcmsmac: Remove unneeded variable and make function to be void zhong jiang
  2019-09-12 16:41 ` [PATCH 2/3] wlegacy: " zhong jiang
@ 2019-09-12 16:41 ` " zhong jiang
  2019-09-13 13:38   ` Kalle Valo
  2 siblings, 1 reply; 8+ messages in thread
From: zhong jiang @ 2019-09-12 16:41 UTC (permalink / raw)
  To: kvalo; +Cc: davem, zhongjiang, linux-wireless, netdev, linux-kernel

lbs_process_event  do not need return value to cope with different
cases. And change functon return type to void.

Signed-off-by: zhong jiang <zhongjiang@huawei.com>
---
 drivers/net/wireless/marvell/libertas/cmd.h     | 2 +-
 drivers/net/wireless/marvell/libertas/cmdresp.c | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/drivers/net/wireless/marvell/libertas/cmd.h b/drivers/net/wireless/marvell/libertas/cmd.h
index 8087856..3c19307 100644
--- a/drivers/net/wireless/marvell/libertas/cmd.h
+++ b/drivers/net/wireless/marvell/libertas/cmd.h
@@ -76,7 +76,7 @@ void lbs_mac_event_disconnected(struct lbs_private *priv,
 
 /* Events */
 
-int lbs_process_event(struct lbs_private *priv, u32 event);
+void lbs_process_event(struct lbs_private *priv, u32 event);
 
 
 /* Actual commands */
diff --git a/drivers/net/wireless/marvell/libertas/cmdresp.c b/drivers/net/wireless/marvell/libertas/cmdresp.c
index b73d083..cb515c5 100644
--- a/drivers/net/wireless/marvell/libertas/cmdresp.c
+++ b/drivers/net/wireless/marvell/libertas/cmdresp.c
@@ -220,9 +220,8 @@ int lbs_process_command_response(struct lbs_private *priv, u8 *data, u32 len)
 	return ret;
 }
 
-int lbs_process_event(struct lbs_private *priv, u32 event)
+void lbs_process_event(struct lbs_private *priv, u32 event)
 {
-	int ret = 0;
 	struct cmd_header cmd;
 
 	switch (event) {
@@ -351,6 +350,4 @@ int lbs_process_event(struct lbs_private *priv, u32 event)
 		netdev_alert(priv->dev, "EVENT: unknown event id %d\n", event);
 		break;
 	}
-
-	return ret;
 }
-- 
1.7.12.4


^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH 2/3] wlegacy: Remove unneeded variable and make function to be void
  2019-09-12 16:41 ` [PATCH 2/3] wlegacy: " zhong jiang
@ 2019-09-12 17:45   ` Kalle Valo
  2019-09-16  5:53     ` zhong jiang
  0 siblings, 1 reply; 8+ messages in thread
From: Kalle Valo @ 2019-09-12 17:45 UTC (permalink / raw)
  To: zhong jiang; +Cc: davem, linux-wireless, netdev, linux-kernel

zhong jiang <zhongjiang@huawei.com> writes:

> il4965_set_tkip_dynamic_key_info  do not need return value to
> cope with different ases. And change functon return type to void.
>
> Signed-off-by: zhong jiang <zhongjiang@huawei.com>
> ---
>  drivers/net/wireless/intel/iwlegacy/4965-mac.c | 8 ++------
>  1 file changed, 2 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/net/wireless/intel/iwlegacy/4965-mac.c b/drivers/net/wireless/intel/iwlegacy/4965-mac.c
> index ffb705b..a7bbfe2 100644
> --- a/drivers/net/wireless/intel/iwlegacy/4965-mac.c
> +++ b/drivers/net/wireless/intel/iwlegacy/4965-mac.c
> @@ -3326,12 +3326,11 @@ struct il_mod_params il4965_mod_params = {
>  	return il_send_add_sta(il, &sta_cmd, CMD_SYNC);
>  }
>  
> -static int
> +static void
>  il4965_set_tkip_dynamic_key_info(struct il_priv *il,
>  				 struct ieee80211_key_conf *keyconf, u8 sta_id)
>  {
>  	unsigned long flags;
> -	int ret = 0;
>  	__le16 key_flags = 0;
>  
>  	key_flags |= (STA_KEY_FLG_TKIP | STA_KEY_FLG_MAP_KEY_MSK);
> @@ -3367,8 +3366,6 @@ struct il_mod_params il4965_mod_params = {
>  	memcpy(il->stations[sta_id].sta.key.key, keyconf->key, 16);
>  
>  	spin_unlock_irqrestore(&il->sta_lock, flags);
> -
> -	return ret;
>  }
>  
>  void
> @@ -3483,8 +3480,7 @@ struct il_mod_params il4965_mod_params = {
>  		    il4965_set_ccmp_dynamic_key_info(il, keyconf, sta_id);
>  		break;
>  	case WLAN_CIPHER_SUITE_TKIP:
> -		ret =
> -		    il4965_set_tkip_dynamic_key_info(il, keyconf, sta_id);
> +		il4965_set_tkip_dynamic_key_info(il, keyconf, sta_id);
>  		break;
>  	case WLAN_CIPHER_SUITE_WEP40:
>  	case WLAN_CIPHER_SUITE_WEP104:

To me this looks inconsistent with the rest of the cases in the switch
statement. And won't we then return the ret variable uninitalised?

-- 
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH 1/3] brcmsmac: Remove unneeded variable and make function to be void
  2019-09-12 16:41 ` [PATCH 1/3] brcmsmac: Remove unneeded variable and make function to be void zhong jiang
@ 2019-09-13 13:37   ` Kalle Valo
  0 siblings, 0 replies; 8+ messages in thread
From: Kalle Valo @ 2019-09-13 13:37 UTC (permalink / raw)
  To: zhong jiang; +Cc: davem, zhongjiang, linux-wireless, netdev, linux-kernel

zhong jiang <zhongjiang@huawei.com> wrote:

> brcms_c_set_mac  do not need return value to cope with different
> cases. And change functon return type to void.
> 
> Signed-off-by: zhong jiang <zhongjiang@huawei.com>

I just don't see the benefit from changing the function to return void.
And if we ever add error handling to the function we need to change it
back to return int again, which is extra work.

Patch set to Rejected.

-- 
https://patchwork.kernel.org/patch/11143403/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches


^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH 3/3] libertas: Remove unneeded variable and make function to be void
  2019-09-12 16:41 ` [PATCH 3/3] libertas: " zhong jiang
@ 2019-09-13 13:38   ` Kalle Valo
  0 siblings, 0 replies; 8+ messages in thread
From: Kalle Valo @ 2019-09-13 13:38 UTC (permalink / raw)
  To: zhong jiang; +Cc: davem, zhongjiang, linux-wireless, netdev, linux-kernel

zhong jiang <zhongjiang@huawei.com> wrote:

> lbs_process_event  do not need return value to cope with different
> cases. And change functon return type to void.
> 
> Signed-off-by: zhong jiang <zhongjiang@huawei.com>

Same here, I just don't see the benefit.

Patch set to Rejected.

-- 
https://patchwork.kernel.org/patch/11143397/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches


^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH 2/3] wlegacy: Remove unneeded variable and make function to be void
  2019-09-12 17:45   ` Kalle Valo
@ 2019-09-16  5:53     ` zhong jiang
  0 siblings, 0 replies; 8+ messages in thread
From: zhong jiang @ 2019-09-16  5:53 UTC (permalink / raw)
  To: Kalle Valo; +Cc: davem, linux-wireless, netdev, linux-kernel

On 2019/9/13 1:45, Kalle Valo wrote:
> zhong jiang <zhongjiang@huawei.com> writes:
>
>> il4965_set_tkip_dynamic_key_info  do not need return value to
>> cope with different ases. And change functon return type to void.
>>
>> Signed-off-by: zhong jiang <zhongjiang@huawei.com>
>> ---
>>  drivers/net/wireless/intel/iwlegacy/4965-mac.c | 8 ++------
>>  1 file changed, 2 insertions(+), 6 deletions(-)
>>
>> diff --git a/drivers/net/wireless/intel/iwlegacy/4965-mac.c b/drivers/net/wireless/intel/iwlegacy/4965-mac.c
>> index ffb705b..a7bbfe2 100644
>> --- a/drivers/net/wireless/intel/iwlegacy/4965-mac.c
>> +++ b/drivers/net/wireless/intel/iwlegacy/4965-mac.c
>> @@ -3326,12 +3326,11 @@ struct il_mod_params il4965_mod_params = {
>>  	return il_send_add_sta(il, &sta_cmd, CMD_SYNC);
>>  }
>>  
>> -static int
>> +static void
>>  il4965_set_tkip_dynamic_key_info(struct il_priv *il,
>>  				 struct ieee80211_key_conf *keyconf, u8 sta_id)
>>  {
>>  	unsigned long flags;
>> -	int ret = 0;
>>  	__le16 key_flags = 0;
>>  
>>  	key_flags |= (STA_KEY_FLG_TKIP | STA_KEY_FLG_MAP_KEY_MSK);
>> @@ -3367,8 +3366,6 @@ struct il_mod_params il4965_mod_params = {
>>  	memcpy(il->stations[sta_id].sta.key.key, keyconf->key, 16);
>>  
>>  	spin_unlock_irqrestore(&il->sta_lock, flags);
>> -
>> -	return ret;
>>  }
>>  
>>  void
>> @@ -3483,8 +3480,7 @@ struct il_mod_params il4965_mod_params = {
>>  		    il4965_set_ccmp_dynamic_key_info(il, keyconf, sta_id);
>>  		break;
>>  	case WLAN_CIPHER_SUITE_TKIP:
>> -		ret =
>> -		    il4965_set_tkip_dynamic_key_info(il, keyconf, sta_id);
>> +		il4965_set_tkip_dynamic_key_info(il, keyconf, sta_id);
>>  		break;
>>  	case WLAN_CIPHER_SUITE_WEP40:
>>  	case WLAN_CIPHER_SUITE_WEP104:
> To me this looks inconsistent with the rest of the cases in the switch
> statement. And won't we then return the ret variable uninitalised?
Yep,  I miss that.   please ignore the patch.  Thanks,

Sincerely,
zhong jiang


^ permalink raw reply	[flat|nested] 8+ messages in thread

end of thread, back to index

Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-09-12 16:41 [PATCH 0/3] wireless: Remove unneeded variable zhong jiang
2019-09-12 16:41 ` [PATCH 1/3] brcmsmac: Remove unneeded variable and make function to be void zhong jiang
2019-09-13 13:37   ` Kalle Valo
2019-09-12 16:41 ` [PATCH 2/3] wlegacy: " zhong jiang
2019-09-12 17:45   ` Kalle Valo
2019-09-16  5:53     ` zhong jiang
2019-09-12 16:41 ` [PATCH 3/3] libertas: " zhong jiang
2019-09-13 13:38   ` Kalle Valo

Linux-Wireless Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-wireless/0 linux-wireless/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-wireless linux-wireless/ https://lore.kernel.org/linux-wireless \
		linux-wireless@vger.kernel.org linux-wireless@archiver.kernel.org
	public-inbox-index linux-wireless

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-wireless


AGPL code for this site: git clone https://public-inbox.org/ public-inbox