[PATCH] staging: rtl8723bs: remove unnecessary else block after return

Abraham Samuel Adekunle posted 1 patch 8 months, 3 weeks ago
drivers/staging/rtl8723bs/core/rtw_mlme.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
[PATCH] staging: rtl8723bs: remove unnecessary else block after return
Posted by Abraham Samuel Adekunle 8 months, 3 weeks ago
The else block after the return statement is unnecessary since
execution does not continue past the return statement.

Remove the else block while preserving logic making the code cleaner
and more readable.

reported by checkpatch:

WARNING: else is not generally useful after a break or return

Signed-off-by: Abraham Samuel Adekunle <abrahamadekunle50@gmail.com>
---
 drivers/staging/rtl8723bs/core/rtw_mlme.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rtl8723bs/core/rtw_mlme.c
index 5ded183aa08c..91c6a962f7e8 100644
--- a/drivers/staging/rtl8723bs/core/rtw_mlme.c
+++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c
@@ -2022,12 +2022,12 @@ signed int rtw_restruct_sec_ie(struct adapter *adapter, u8 *in_ie, u8 *out_ie, u
 	}

 	iEntry = SecIsInPMKIDList(adapter, pmlmepriv->assoc_bssid);
-	if (iEntry < 0) {
+	if (iEntry < 0)
 		return ielength;
-	} else {
-		if (authmode == WLAN_EID_RSN)
-			ielength = rtw_append_pmkid(adapter, iEntry, out_ie, ielength);
-	}
+
+	if (authmode == WLAN_EID_RSN)
+		ielength = rtw_append_pmkid(adapter, iEntry, out_ie, ielength);
+
 	return ielength;
 }

--
2.34.1
Re: [PATCH] staging: rtl8723bs: remove unnecessary else block after return
Posted by Julia Lawall 8 months, 3 weeks ago

On Tue, 25 Mar 2025, Abraham Samuel Adekunle wrote:

> The else block after the return statement is unnecessary since
> execution does not continue past the return statement.
>
> Remove the else block while preserving logic making the code cleaner
> and more readable.
>
> reported by checkpatch:
>
> WARNING: else is not generally useful after a break or return
>
> Signed-off-by: Abraham Samuel Adekunle <abrahamadekunle50@gmail.com>

Reviewed-by: Julia Lawall <julia.lawall@inria.fr>,

> ---
>  drivers/staging/rtl8723bs/core/rtw_mlme.c | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rtl8723bs/core/rtw_mlme.c
> index 5ded183aa08c..91c6a962f7e8 100644
> --- a/drivers/staging/rtl8723bs/core/rtw_mlme.c
> +++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c
> @@ -2022,12 +2022,12 @@ signed int rtw_restruct_sec_ie(struct adapter *adapter, u8 *in_ie, u8 *out_ie, u
>  	}
>
>  	iEntry = SecIsInPMKIDList(adapter, pmlmepriv->assoc_bssid);
> -	if (iEntry < 0) {
> +	if (iEntry < 0)
>  		return ielength;
> -	} else {
> -		if (authmode == WLAN_EID_RSN)
> -			ielength = rtw_append_pmkid(adapter, iEntry, out_ie, ielength);
> -	}
> +
> +	if (authmode == WLAN_EID_RSN)
> +		ielength = rtw_append_pmkid(adapter, iEntry, out_ie, ielength);
> +
>  	return ielength;
>  }
>
> --
> 2.34.1
>
>