Skip to contentSkip to conversation

staging: rtl8723bs: fix coding style issues in rtw_mlme.c

PATCH Superseded Michael Huang 3 participants 6 messages Jan 23 – Jan 27 Staging

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 staging: rtl8723bs: fix coding style issues in rtw_mlme.c

This patch fixes several checkpatch.pl issues:
1. Remove redundant else after break/return.
2. Remove unnecessary boolean comparisons (== true/false).
3. Fix trailing whitespaces and overly deep indentation.

---
 drivers/staging/rtl8723bs/core/rtw_mlme.c | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)
drivers/staging/rtl8723bs/core/rtw_mlme.c +6 -11
index 98704179ad35..71a0efe49bdd 100644
@@ -710,8 +710,8 @@ void rtw_surveydone_event_callback(struct adapter	*adapter, u8 *pbuf)
 	rtw_set_signal_stat_timer(&adapter->recvpriv);
 
 	if (pmlmepriv->to_join) {
-		if ((check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) == true)) {
-			if (check_fwstate(pmlmepriv, _FW_LINKED) == false) {
+		if (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE)) {
+			if (!check_fwstate(pmlmepriv, _FW_LINKED)) {
 				set_fwstate(pmlmepriv, _FW_UNDER_LINKING);
 
 				if (rtw_select_and_join_from_scanned_queue(pmlmepriv) == _SUCCESS) {
@@ -1206,10 +1206,9 @@ void rtw_joinbss_event_prehandle(struct adapter *adapter, u8 *pbuf)
 						rtw_free_stainfo(adapter,  pcur_sta);
 
 					ptarget_wlan = rtw_find_network(&pmlmepriv->scanned_queue, pnetwork->network.mac_address);
-					if (check_fwstate(pmlmepriv, WIFI_STATION_STATE) == true) {
-						if (ptarget_wlan)
-							ptarget_wlan->fixed = true;
-					}
+					if (check_fwstate(pmlmepriv, WIFI_STATION_STATE) &&
+					    ptarget_wlan)
+						ptarget_wlan->fixed = true;
 				}
 
 			} else {
@@ -1560,10 +1559,6 @@ void _rtw_join_timeout_handler(struct timer_list *t)
 				do_join_r = rtw_do_join(adapter);
 				if (do_join_r != _SUCCESS)
 					continue;
-
-				break;
-			} else {
-				rtw_indicate_disconnect(adapter);
 				break;
 			}
 		}
@@ -2018,7 +2013,7 @@ int rtw_restruct_wmm_ie(struct adapter *adapter, u8 *in_ie, u8 *out_ie, uint in_
 	return ielength;
 }
 
-/* Ported from 8185: IsInPreAuthKeyList(). 
+/* Ported from 8185: IsInPreAuthKeyList().
  * (Renamed from SecIsInPreAuthKeyList(), 2006-10-13.)
  * Added by Annie, 2006-05-07.
  *
Signature · 1 line
2.43.0
#1 lore raw
Quoted 6 lines · Michael Huang

This patch fixes several checkpatch.pl issues:
1. Remove redundant else after break/return.
2. Remove unnecessary boolean comparisons (== true/false).
3. Fix trailing whitespaces and overly deep indentation.

Split this up into multiple patches.

drivers/staging/rtl8723bs/core/rtw_mlme.c void _rtw_join_timeout_handler(struct timer_list *t) · line 1564

Quoted 11 lines
drivers/staging/rtl8723bs/core/rtw_mlme.c +0 -4
@@ -1560,10 +1559,6 @@ void _rtw_join_timeout_handler(struct timer_list *t)
 				do_join_r = rtw_do_join(adapter);
 				if (do_join_r != _SUCCESS)
 					continue;
-
-				break;
-			} else {
-				rtw_indicate_disconnect(adapter);
 				break;
 			}
 		}

You accidentally deleted some important stuff here.

regards,
dan carpenter

#2 lore raw

v2 cover staging: rtl8723bs: fix coding style and logic in rtw_mlme.c

This patch series fixes several checkpatch.pl issues in rtw_mlme.c. The previous single patch has been split into a series of two patches to separate pure style cleanups from structural refactoring.

A logic regression in _rtw_join_timeout_handler() from the first version has also been corrected.

Changes in v2:
- Split the original patch into two separate commits.
- Restored the call to rtw_indicate_disconnect() which was accidentally removed in the first version.
- Improved commit descriptions for both patches.

Michael Huang (2):
staging: rtl8723bs: remove unnecessary boolean comparisons and
whitespaces
staging: rtl8723bs: remove redundant else after break

 drivers/staging/rtl8723bs/core/rtw_mlme.c | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)
Signature · 1 line
2.43.0
#3 lore raw

PATCH v2 1/2 staging: rtl8723bs: remove unnecessary boolean comparisons and whitespaces

According to the kernel coding style, explicit comparisons with true or false are redundant and should be avoided. This patch removes these comparisons in rtw_mlme.c to improve code clarity. Additionally, trailing whitespaces are removed to satisfy checkpatch.pl requirements.

---
 drivers/staging/rtl8723bs/core/rtw_mlme.c | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)
drivers/staging/rtl8723bs/core/rtw_mlme.c +6 -7
index 98704179ad35..ed754fdbfe7a 100644
@@ -710,8 +710,8 @@ void rtw_surveydone_event_callback(struct adapter	*adapter, u8 *pbuf)
 	rtw_set_signal_stat_timer(&adapter->recvpriv);
 
 	if (pmlmepriv->to_join) {
-		if ((check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) == true)) {
-			if (check_fwstate(pmlmepriv, _FW_LINKED) == false) {
+		if (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE)) {
+			if (!check_fwstate(pmlmepriv, _FW_LINKED)) {
 				set_fwstate(pmlmepriv, _FW_UNDER_LINKING);
 
 				if (rtw_select_and_join_from_scanned_queue(pmlmepriv) == _SUCCESS) {
@@ -1206,10 +1206,9 @@ void rtw_joinbss_event_prehandle(struct adapter *adapter, u8 *pbuf)
 						rtw_free_stainfo(adapter,  pcur_sta);
 
 					ptarget_wlan = rtw_find_network(&pmlmepriv->scanned_queue, pnetwork->network.mac_address);
-					if (check_fwstate(pmlmepriv, WIFI_STATION_STATE) == true) {
-						if (ptarget_wlan)
-							ptarget_wlan->fixed = true;
-					}
+					if (check_fwstate(pmlmepriv, WIFI_STATION_STATE) &&
+					    ptarget_wlan)
+						ptarget_wlan->fixed = true;
 				}
 
 			} else {
@@ -2018,7 +2017,7 @@ int rtw_restruct_wmm_ie(struct adapter *adapter, u8 *in_ie, u8 *out_ie, uint in_
 	return ielength;
 }
 
-/* Ported from 8185: IsInPreAuthKeyList(). 
+/* Ported from 8185: IsInPreAuthKeyList().
  * (Renamed from SecIsInPreAuthKeyList(), 2006-10-13.)
  * Added by Annie, 2006-05-07.
  *
Signature · 1 line
2.43.0
maintainer
#4 lore raw

Re: [PATCH v2 1/2] staging: rtl8723bs: remove unnecessary boolean comparisons and whitespaces

Quoted 4 lines · Michael Huang

According to the kernel coding style, explicit comparisons with true or false are redundant and should be avoided. This patch removes these comparisons in rtw_mlme.c to improve code clarity. Additionally, trailing whitespaces are removed to satisfy checkpatch.pl requirements.

That is two different things in one patch, please do not do that. Remember, only one logical change per patch.

thanks,

greg k-h

#5 lore raw

PATCH v2 2/2 staging: rtl8723bs: remove redundant else after break

In reply to Michael Huang

In _rtw_join_timeout_handler(), an else statement followed a break in the previous logic. Removing this else reduces the indentation level of the following code and makes the function easier to read, while maintaining the original logic by ensuring that disconnect indication is still called when roaming fails.

---
 drivers/staging/rtl8723bs/core/rtw_mlme.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/staging/rtl8723bs/core/rtw_mlme.c +2 -4
index ed754fdbfe7a..ac47b2a4f65f 100644
@@ -1559,12 +1559,10 @@ void _rtw_join_timeout_handler(struct timer_list *t)
 				do_join_r = rtw_do_join(adapter);
 				if (do_join_r != _SUCCESS)
 					continue;
-
-				break;
-			} else {
-				rtw_indicate_disconnect(adapter);
 				break;
 			}
+			rtw_indicate_disconnect(adapter);
+			break;
 		}
 
 	} else {
Signature · 1 line
2.43.0