Skip to contentSkip to conversation

staging: rtl8723bs: Rename TrafficTransitionCount to traffic_transition_count

PATCH In review Malavya Raval 3 participants 3 messages Mar 18 – Mar 19 Staging

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 staging: rtl8723bs: Rename TrafficTransitionCount to traffic_transition_count

Renaming CamelCase variable to snake_case to align with kernel coding style standards.

---
 drivers/staging/rtl8723bs/core/rtw_cmd.c      | 18 +++++++++---------
 drivers/staging/rtl8723bs/core/rtw_mlme.c     |  2 +-
 drivers/staging/rtl8723bs/core/rtw_mlme_ext.c |  2 +-
 drivers/staging/rtl8723bs/include/rtw_mlme.h  |  2 +-
 drivers/staging/rtl8723bs/os_dep/os_intfs.c   |  2 +-
 5 files changed, 13 insertions(+), 13 deletions(-)
drivers/staging/rtl8723bs/core/rtw_cmd.c +9 -9
index abb84f8ae..cf6b2bf8c 100644
@@ -1173,21 +1173,21 @@ u8 traffic_status_watchdog(struct adapter *padapter, u8 from_timer)
 			bEnterPS = false;
 
 			if (bBusyTraffic) {
-				if (pmlmepriv->LinkDetectInfo.TrafficTransitionCount <= 4)
-					pmlmepriv->LinkDetectInfo.TrafficTransitionCount = 4;
+				if (pmlmepriv->LinkDetectInfo.traffic_transition_count <= 4)
+					pmlmepriv->LinkDetectInfo.traffic_transition_count = 4;
 
-				pmlmepriv->LinkDetectInfo.TrafficTransitionCount++;
+				pmlmepriv->LinkDetectInfo.traffic_transition_count++;
 
-				if (pmlmepriv->LinkDetectInfo.TrafficTransitionCount > 30/*TrafficTransitionLevel*/)
-					pmlmepriv->LinkDetectInfo.TrafficTransitionCount = 30;
+				if (pmlmepriv->LinkDetectInfo.traffic_transition_count > 30) /* TrafficTransitionLevel */
+					pmlmepriv->LinkDetectInfo.traffic_transition_count = 30;
 			}
 		} else {
-			if (pmlmepriv->LinkDetectInfo.TrafficTransitionCount >= 2)
-				pmlmepriv->LinkDetectInfo.TrafficTransitionCount -= 2;
+			if (pmlmepriv->LinkDetectInfo.traffic_transition_count >= 2)
+				pmlmepriv->LinkDetectInfo.traffic_transition_count -= 2;
 			else
-				pmlmepriv->LinkDetectInfo.TrafficTransitionCount = 0;
+				pmlmepriv->LinkDetectInfo.traffic_transition_count = 0;
 
-			if (pmlmepriv->LinkDetectInfo.TrafficTransitionCount == 0)
+			if (pmlmepriv->LinkDetectInfo.traffic_transition_count == 0)
 				bEnterPS = true;
 		}
 
drivers/staging/rtl8723bs/core/rtw_mlme.c +1 -1
index 1ef48bf65..b27a726d8 100644
@@ -1174,7 +1174,7 @@ void rtw_joinbss_event_prehandle(struct adapter *adapter, u8 *pbuf)
 
 	spin_lock_bh(&pmlmepriv->lock);
 
-	pmlmepriv->LinkDetectInfo.TrafficTransitionCount = 0;
+	pmlmepriv->LinkDetectInfo.traffic_transition_count = 0;
 	pmlmepriv->LinkDetectInfo.LowPowerTransitionCount = 0;
 
 	if (pnetwork->join_res > 0) {
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +1 -1
index b1f20aa81..07719cd53 100644
@@ -4757,7 +4757,7 @@ static void rtw_mlmeext_disconnect(struct adapter *padapter)
 	timer_delete_sync(&pmlmeext->link_timer);
 
 	/* pmlmepriv->LinkDetectInfo.TrafficBusyState = false; */
-	pmlmepriv->LinkDetectInfo.TrafficTransitionCount = 0;
+	pmlmepriv->LinkDetectInfo.traffic_transition_count = 0;
 	pmlmepriv->LinkDetectInfo.LowPowerTransitionCount = 0;
 
 }
drivers/staging/rtl8723bs/include/rtw_mlme.h +1 -1
index 2a128568c..23e3e5d1f 100644
@@ -103,7 +103,7 @@ struct rt_link_detect_t {
 	bool			bHigherBusyRxTraffic; /*  We may disable Tx interrupt according as Rx traffic. */
 	bool			bHigherBusyTxTraffic; /*  We may disable Tx interrupt according as Tx traffic. */
 	/* u8 TrafficBusyState; */
-	u8 TrafficTransitionCount;
+	u8 traffic_transition_count;
 	u32 LowPowerTransitionCount;
 };
 
drivers/staging/rtl8723bs/os_dep/os_intfs.c +1 -1
index 29939bf5a..35e948cbb 100644
@@ -621,7 +621,7 @@ void rtw_reset_drv_sw(struct adapter *padapter)
 	pmlmepriv->LinkDetectInfo.bBusyTraffic = false;
 
 	/* pmlmepriv->LinkDetectInfo.TrafficBusyState = false; */
-	pmlmepriv->LinkDetectInfo.TrafficTransitionCount = 0;
+	pmlmepriv->LinkDetectInfo.traffic_transition_count = 0;
 	pmlmepriv->LinkDetectInfo.LowPowerTransitionCount = 0;
 
 	_clr_fwstate_(pmlmepriv, _FW_UNDER_SURVEY | _FW_UNDER_LINKING);
Signature · 1 line
2.43.0
#2 lore raw
In reply to Malavya Raval
Quoted 2 lines · Malavya Raval

Renaming CamelCase variable to snake_case to align with kernel coding style standards.

Line wrap your commit message at 74 characters.

drivers/staging/rtl8723bs/core/rtw_cmd.c u8 traffic_status_watchdog(struct adapter *padapter, u8 from_timer) · line 1181

Quoted 3 lines
drivers/staging/rtl8723bs/core/rtw_cmd.c +1 -2
-				if (pmlmepriv->LinkDetectInfo.TrafficTransitionCount > 30/*TrafficTransitionLevel*/)
-					pmlmepriv->LinkDetectInfo.TrafficTransitionCount = 30;
+				if (pmlmepriv->LinkDetectInfo.traffic_transition_count > 30) /* TrafficTransitionLevel */

You moved the comment out of the parentheses? Why? What does the comment even mean? So many questions. Are we could to keep the TrafficTransitionLevel name after we renamed TrafficTransitionCount?

Probably sort that out in a patch at the start and then do a rename.

regards,
dan carpenter