diff mbox series

mwifiex: Remove redundant assignment

Message ID 20210317060956.1009-1-zuoqilin1@163.com (mailing list archive)
State Rejected
Delegated to: Kalle Valo
Headers show
Series mwifiex: Remove redundant assignment | expand

Commit Message

zuoqilin1@163.com March 17, 2021, 6:09 a.m. UTC 
From: zuoqilin <zuoqilin@yulong.com>

There is no need to define the err variable,
and then assign -EINVAL, we can directly return -EINVAL.

Signed-off-by: zuoqilin <zuoqilin@yulong.com>
---
 drivers/net/wireless/marvell/mwifiex/ie.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

Comments

Sharvari Harisangam March 17, 2021, 7:25 a.m. UTC | #1 
We need to return 0 in success case. So this can't be removed.

> -----Original Message-----
> From: zuoqilin1@163.com <zuoqilin1@163.com>
> Sent: Wednesday, March 17, 2021 11:40 AM
> To: amitkarwar@gmail.com; ganapathi017@gmail.com; Sharvari Harisangam
> <sharvari.harisangam@nxp.com>; huxinming820@gmail.com;
> kvalo@codeaurora.org; davem@davemloft.net; kuba@kernel.org
> Cc: linux-wireless@vger.kernel.org; netdev@vger.kernel.org; linux-
> kernel@vger.kernel.org; zuoqilin <zuoqilin@yulong.com>
> Subject: [EXT] [PATCH] mwifiex: Remove redundant assignment
> 
> Caution: EXT Email
> 
> From: zuoqilin <zuoqilin@yulong.com>
> 
> There is no need to define the err variable, and then assign -EINVAL, we can
> directly return -EINVAL.
> 
> Signed-off-by: zuoqilin <zuoqilin@yulong.com>
> ---
>  drivers/net/wireless/marvell/mwifiex/ie.c | 7 +------
>  1 file changed, 1 insertion(+), 6 deletions(-)
> 
> diff --git a/drivers/net/wireless/marvell/mwifiex/ie.c
> b/drivers/net/wireless/marvell/mwifiex/ie.c
> index 40e99ea..c88213c 100644
> --- a/drivers/net/wireless/marvell/mwifiex/ie.c
> +++ b/drivers/net/wireless/marvell/mwifiex/ie.c
> @@ -333,7 +333,6 @@ static int mwifiex_uap_parse_tail_ies(struct
> mwifiex_private *priv,
>         u16 gen_idx = MWIFIEX_AUTO_IDX_MASK, ie_len = 0;
>         int left_len, parsed_len = 0;
>         unsigned int token_len;
> -       int err = 0;
> 
>         if (!info->tail || !info->tail_len)
>                 return 0;
> @@ -351,7 +350,6 @@ static int mwifiex_uap_parse_tail_ies(struct
> mwifiex_private *priv,
>                 hdr = (void *)(info->tail + parsed_len);
>                 token_len = hdr->len + sizeof(struct ieee_types_header);
>                 if (token_len > left_len) {
> -                       err = -EINVAL;
>                         goto out;
>                 }
> 
> @@ -377,7 +375,6 @@ static int mwifiex_uap_parse_tail_ies(struct
> mwifiex_private *priv,
>                         fallthrough;
>                 default:
>                         if (ie_len + token_len > IEEE_MAX_IE_SIZE) {
> -                               err = -EINVAL;
>                                 goto out;
>                         }
>                         memcpy(gen_ie->ie_buffer + ie_len, hdr, token_len); @@ -397,7
> +394,6 @@ static int mwifiex_uap_parse_tail_ies(struct mwifiex_private *priv,
>         if (vendorhdr) {
>                 token_len = vendorhdr->len + sizeof(struct ieee_types_header);
>                 if (ie_len + token_len > IEEE_MAX_IE_SIZE) {
> -                       err = -EINVAL;
>                         goto out;
>                 }
>                 memcpy(gen_ie->ie_buffer + ie_len, vendorhdr, token_len); @@ -415,7
> +411,6 @@ static int mwifiex_uap_parse_tail_ies(struct mwifiex_private *priv,
> 
>         if (mwifiex_update_uap_custom_ie(priv, gen_ie, &gen_idx, NULL, NULL,
>                                          NULL, NULL)) {
> -               err = -EINVAL;
>                 goto out;
>         }
> 
> @@ -423,7 +418,7 @@ static int mwifiex_uap_parse_tail_ies(struct
> mwifiex_private *priv,
> 
>   out:
>         kfree(gen_ie);
> -       return err;
> +       return -EINVAL;
>  }
> 
>  /* This function parses different IEs-head & tail IEs, beacon IEs,
> --
> 1.9.1
diff mbox series

Patch

diff --git a/drivers/net/wireless/marvell/mwifiex/ie.c b/drivers/net/wireless/marvell/mwifiex/ie.c
index 40e99ea..c88213c 100644
--- a/drivers/net/wireless/marvell/mwifiex/ie.c
+++ b/drivers/net/wireless/marvell/mwifiex/ie.c
@@ -333,7 +333,6 @@  static int mwifiex_uap_parse_tail_ies(struct mwifiex_private *priv,
 	u16 gen_idx = MWIFIEX_AUTO_IDX_MASK, ie_len = 0;
 	int left_len, parsed_len = 0;
 	unsigned int token_len;
-	int err = 0;
 
 	if (!info->tail || !info->tail_len)
 		return 0;
@@ -351,7 +350,6 @@  static int mwifiex_uap_parse_tail_ies(struct mwifiex_private *priv,
 		hdr = (void *)(info->tail + parsed_len);
 		token_len = hdr->len + sizeof(struct ieee_types_header);
 		if (token_len > left_len) {
-			err = -EINVAL;
 			goto out;
 		}
 
@@ -377,7 +375,6 @@  static int mwifiex_uap_parse_tail_ies(struct mwifiex_private *priv,
 			fallthrough;
 		default:
 			if (ie_len + token_len > IEEE_MAX_IE_SIZE) {
-				err = -EINVAL;
 				goto out;
 			}
 			memcpy(gen_ie->ie_buffer + ie_len, hdr, token_len);
@@ -397,7 +394,6 @@  static int mwifiex_uap_parse_tail_ies(struct mwifiex_private *priv,
 	if (vendorhdr) {
 		token_len = vendorhdr->len + sizeof(struct ieee_types_header);
 		if (ie_len + token_len > IEEE_MAX_IE_SIZE) {
-			err = -EINVAL;
 			goto out;
 		}
 		memcpy(gen_ie->ie_buffer + ie_len, vendorhdr, token_len);
@@ -415,7 +411,6 @@  static int mwifiex_uap_parse_tail_ies(struct mwifiex_private *priv,
 
 	if (mwifiex_update_uap_custom_ie(priv, gen_ie, &gen_idx, NULL, NULL,
 					 NULL, NULL)) {
-		err = -EINVAL;
 		goto out;
 	}
 
@@ -423,7 +418,7 @@  static int mwifiex_uap_parse_tail_ies(struct mwifiex_private *priv,
 
  out:
 	kfree(gen_ie);
-	return err;
+	return -EINVAL;
 }
 
 /* This function parses different IEs-head & tail IEs, beacon IEs,