[PATCH 04/61] staging: rtl8723bs: remove redundant rtw_dec_to_roam helper

[Arsenii Pashchenko]

Eliminate the redundant rtw_dec_to_roam() inline helper function by
replacing it with the open-coded prefix decrement operator '--' at all
call sites.

Since the original helper merely decrements the mlmepriv.to_roam field
and returns its updated value, using '--adapter->mlmepriv.to_roam' acts
as a direct, native language equivalent. This reduces boilerplate and
improves code scannability.

Signed-off-by: Arsenii Pashchenko <ulijg308@xxxxxxxxx>
---
 drivers/staging/rtl8723bs/core/rtw_mlme.c    | 15 +++++----------
 drivers/staging/rtl8723bs/include/rtw_mlme.h |  1 -
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rtl8723bs/core/rtw_mlme.c
index 6c042de11..b038233af 100644
--- a/drivers/staging/rtl8723bs/core/rtw_mlme.c
+++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c
@@ -745,7 +745,7 @@ void rtw_surveydone_event_callback(struct adapter	*adapter, u8 *pbuf)
 				rtw_indicate_connect(adapter);
 			} else {
 				if (adapter->mlmepriv.to_roam != 0) {
-					if (rtw_dec_to_roam(adapter) == 0 ||
+					if (--adapter->mlmepriv.to_roam == 0 ||
 					    rtw_sitesurvey_cmd(adapter, &pmlmepriv->assoc_ssid,
 							       1, NULL, 0) != _SUCCESS) {
 						rtw_set_to_roam(adapter, 0);
@@ -1421,7 +1421,8 @@ void rtw_stadel_event_callback(struct adapter *adapter, u8 *pbuf)
 
 		if (roam) {
 			if (adapter->mlmepriv.to_roam > 0)
-				rtw_dec_to_roam(adapter); /* this stadel_event is caused by roaming, decrease to_roam */
+				/* this stadel_event is caused by roaming, decrease to_roam */
+				--adapter->mlmepriv.to_roam;
 			else if (adapter->mlmepriv.to_roam == 0)
 				rtw_set_to_roam(adapter, adapter->registrypriv.max_roaming_times);
 		} else {
@@ -1518,7 +1519,7 @@ void _rtw_join_timeout_handler(struct timer_list *t)
 
 	if (adapter->mlmepriv.to_roam > 0) { /* join timeout caused by roaming */
 		while (1) {
-			rtw_dec_to_roam(adapter);
+			--adapter->mlmepriv.to_roam;
 			if (adapter->mlmepriv.to_roam != 0) { /* try another */
 				int do_join_r;
 
@@ -2534,12 +2535,6 @@ inline void rtw_set_to_roam(struct adapter *adapter, u8 to_roam)
 	adapter->mlmepriv.to_roam = to_roam;
 }
 
-inline u8 rtw_dec_to_roam(struct adapter *adapter)
-{
-	adapter->mlmepriv.to_roam--;
-	return adapter->mlmepriv.to_roam;
-}
-
 
 void rtw_roaming(struct adapter *padapter, struct wlan_network *tgt_network)
 {
@@ -2561,7 +2556,7 @@ void _rtw_roaming(struct adapter *padapter, struct wlan_network *tgt_network)
 		pmlmepriv->assoc_by_bssid = false;
 
 		while (rtw_do_join(padapter) != _SUCCESS) {
-			rtw_dec_to_roam(padapter);
+			--padapter->mlmepriv.to_roam;
 			if (padapter->mlmepriv.to_roam <= 0) {
 				rtw_indicate_disconnect(padapter);
 				break;
diff --git a/drivers/staging/rtl8723bs/include/rtw_mlme.h b/drivers/staging/rtl8723bs/include/rtw_mlme.h
index b5276c429..233bf98e2 100644
--- a/drivers/staging/rtl8723bs/include/rtw_mlme.h
+++ b/drivers/staging/rtl8723bs/include/rtw_mlme.h
@@ -388,7 +388,6 @@ int is_same_network(struct wlan_bssid_ex *src, struct wlan_bssid_ex *dst, u8 fea
 void _rtw_roaming(struct adapter *adapter, struct wlan_network *tgt_network);
 void rtw_roaming(struct adapter *adapter, struct wlan_network *tgt_network);
 void rtw_set_to_roam(struct adapter *adapter, u8 to_roam);
-u8 rtw_dec_to_roam(struct adapter *adapter);
 int rtw_select_roaming_candidate(struct mlme_priv *pmlmepriv);
 
 void rtw_sta_media_status_rpt(struct adapter *adapter, struct sta_info *psta, u32 mstatus);
-- 
2.55.0