Re: [PATCH v2] staging: wilc1000: remove unnecessary variable result

[Greg KH <gregkh@linuxfoundation.org>]

On Sat, Mar 09, 2019 at 03:46:10PM +0530, Himadri Pandya wrote:
> Remove unnecessary local variable "result" and its assignments from
> function wilc_set_pmkid_info. Suggested by Coccinelle.
> 
> Signed-off-by: Himadri Pandya <himadri18.07@gmail.com>
> ---
> Changes in V2:
> 	- Arrange the function arguments to the right of "(" in function
> call in the return statement
> 
> diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
> index 4dd9a20f6a0b..fa0e1bd9f836 100644
> --- a/drivers/staging/wilc1000/host_interface.c
> +++ b/drivers/staging/wilc1000/host_interface.c
> @@ -1358,17 +1358,15 @@ int wilc_add_rx_gtk(struct wilc_vif *vif, const u8 *rx_gtk, u8 gtk_key_len,
>  int wilc_set_pmkid_info(struct wilc_vif *vif, struct wilc_pmkid_attr *pmkid)
>  {
>  	struct wid wid;
> -	int result;
> 
>  	wid.id = WID_PMKID_INFO;
>  	wid.type = WID_STR;
>  	wid.size = (pmkid->numpmkid * sizeof(struct wilc_pmkid)) + 1;
>  	wid.val = (u8 *)pmkid;
> 
> -	result = wilc_send_config_pkt(vif, WILC_SET_CFG, &wid, 1,
> -				      wilc_get_vif_idx(vif));
> +	return wilc_send_config_pkt(vif, WILC_SET_CFG, &wid, 1,
> +				    wilc_get_vif_idx(vif));
> 
> -	return result;
>  }
> 
>  int wilc_get_mac_address(struct wilc_vif *vif, u8 *mac_addr)
> ---
>  drivers/staging/wilc1000/host_interface.c | 6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
> index 4dd9a20f6a0b..fa0e1bd9f836 100644
> --- a/drivers/staging/wilc1000/host_interface.c
> +++ b/drivers/staging/wilc1000/host_interface.c
> @@ -1358,17 +1358,15 @@ int wilc_add_rx_gtk(struct wilc_vif *vif, const u8 *rx_gtk, u8 gtk_key_len,
>  int wilc_set_pmkid_info(struct wilc_vif *vif, struct wilc_pmkid_attr *pmkid)
>  {
>  	struct wid wid;
> -	int result;
>  
>  	wid.id = WID_PMKID_INFO;
>  	wid.type = WID_STR;
>  	wid.size = (pmkid->numpmkid * sizeof(struct wilc_pmkid)) + 1;
>  	wid.val = (u8 *)pmkid;
>  
> -	result = wilc_send_config_pkt(vif, WILC_SET_CFG, &wid, 1,
> -				      wilc_get_vif_idx(vif));
> +	return wilc_send_config_pkt(vif, WILC_SET_CFG, &wid, 1,
> +				    wilc_get_vif_idx(vif));
>  
> -	return result;
>  }
>  
>  int wilc_get_mac_address(struct wilc_vif *vif, u8 *mac_addr)
> -- 
> 2.17.1
> 

The same patch is included in this email twice :(

That's not going to go well when I try to apply it, please fix up and
resend.

thanks,

greg k-h