[PATCH] staging: wilc1000: remove unnecessary variable result

[PATCH] staging: wilc1000: remove unnecessary variable result

[Himadri Pandya]

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>
---
 drivers/staging/wilc1000/host_interface.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index 4dd9a20f6a0b..962c5e6edd5e 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,
+	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

Re: [Outreachy kernel] [PATCH] staging: wilc1000: remove unnecessary variable result

[Julia Lawall]

On Sat, 9 Mar 2019, 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>
> ---
>  drivers/staging/wilc1000/host_interface.c | 4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
> index 4dd9a20f6a0b..962c5e6edd5e 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,
> +	return wilc_send_config_pkt(vif, WILC_SET_CFG, &wid, 1,
>  				      wilc_get_vif_idx(vif));

It looks like this now violates the rule that function arguments should
appear just to the right of a (.  Maybe checkpatch didn't check this
because the line with the relevant argument is not affected by the change.

julia

>
> -	return result;
>  }
>
>  int wilc_get_mac_address(struct wilc_vif *vif, u8 *mac_addr)
> --
> 2.17.1
>
> --
> You received this message because you are subscribed to the Google Groups "outreachy-kernel" group.
> To unsubscribe from this group and stop receiving emails from it, send an email to outreachy-kernel+unsubscribe@googlegroups.com.
> To post to this group, send email to outreachy-kernel@googlegroups.com.
> To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/20190309094840.38154-1-himadri18.07%40gmail.com.
> For more options, visit https://groups.google.com/d/optout.
>

Re: [Outreachy kernel] [PATCH] staging: wilc1000: remove unnecessary variable result

[Himadri Pandya]

[-- Attachment #1: Type: text/plain, Size: 2416 bytes --]

On Sat, 9 Mar, 2019, 3:23 PM Julia Lawall, <julia.lawall@lip6.fr> wrote:

>
>
> On Sat, 9 Mar 2019, 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>
> > ---
> >  drivers/staging/wilc1000/host_interface.c | 4 +---
> >  1 file changed, 1 insertion(+), 3 deletions(-)
> >
> > diff --git a/drivers/staging/wilc1000/host_interface.c
> b/drivers/staging/wilc1000/host_interface.c
> > index 4dd9a20f6a0b..962c5e6edd5e 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,
> > +     return wilc_send_config_pkt(vif, WILC_SET_CFG, &wid, 1,
> >                                     wilc_get_vif_idx(vif));
>
> It looks like this now violates the rule that function arguments should
> appear just to the right of a (.  Maybe checkpatch didn't check this
> because the line with the relevant argument is not affected by the change.
>
> julia
>

In version 2, I aligned the parameters with opening parentheses, but still
they appear on the left side in the patch. I double checked, parameters are
properly aligned in the code.

- Himadri


> >
> > -     return result;
> >  }
> >
> >  int wilc_get_mac_address(struct wilc_vif *vif, u8 *mac_addr)
> > --
> > 2.17.1
> >
> > --
> > You received this message because you are subscribed to the Google
> Groups "outreachy-kernel" group.
> > To unsubscribe from this group and stop receiving emails from it, send
> an email to outreachy-kernel+unsubscribe@googlegroups.com.
> > To post to this group, send email to outreachy-kernel@googlegroups.com.
> > To view this discussion on the web visit
> https://groups.google.com/d/msgid/outreachy-kernel/20190309094840.38154-1-himadri18.07%40gmail.com
> .
> > For more options, visit https://groups.google.com/d/optout.
> >
>

[-- Attachment #2: Type: text/html, Size: 3937 bytes --]

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

[Himadri Pandya]

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

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

[Himadri Pandya]

[-- Attachment #1: Type: text/plain, Size: 2636 bytes --]

On Sat, 9 Mar, 2019, 3:47 PM Himadri Pandya, <himadri18.07@gmail.com> 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 diff is appearing twice in the patch. So I'm resending the version 2.

>

[-- Attachment #2: Type: text/html, Size: 3748 bytes --]

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

[Greg KH]

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

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

[Julia Lawall]

On Sat, 9 Mar 2019, 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;

The argument alignment looks fine.  But you have left an empty blank line
at the end of the function.

julia

>  }
>
>  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
>
> --
> You received this message because you are subscribed to the Google Groups "outreachy-kernel" group.
> To unsubscribe from this group and stop receiving emails from it, send an email to outreachy-kernel+unsubscribe@googlegroups.com.
> To post to this group, send email to outreachy-kernel@googlegroups.com.
> To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/20190309101610.39595-1-himadri18.07%40gmail.com.
> For more options, visit https://groups.google.com/d/optout.
>

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

[Himadri Pandya]

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

 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