Skip to contentSkip to conversation

staging: rtl8723bs: rename camelCase variables

PATCH Superseded Nikolay Kulikov 2 participants 4 messages Feb 6 – Feb 16 Staging

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 staging: rtl8723bs: rename camelCase variables

Rename "pHT_caps_ie" to "pht_caps_ie" and "pHT_info_ie" to "pht_info_ie" local variables to comply with Linux coding style.

This fixes the following checkpatch.pl warnings:
CHECK: Avoid CamelCase: <pHT_caps_ie>
CHECK: Avoid CamelCase: <pHT_info_ie>

---
 drivers/staging/rtl8723bs/core/rtw_ap.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/staging/rtl8723bs/core/rtw_ap.c +6 -6
index 477fe238add4..918fcc378fe2 100644
@@ -801,8 +801,8 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf,  int len)
 {
 	int ret = _SUCCESS;
 	u8 *p;
-	u8 *pHT_caps_ie = NULL;
-	u8 *pHT_info_ie = NULL;
+	u8 *pht_caps_ie = NULL;
+	u8 *pht_info_ie = NULL;
 	struct sta_info *psta = NULL;
 	u16 cap, ht_cap = false;
 	uint ie_len = 0;
@@ -1007,7 +1007,7 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf,  int len)
 		u8 max_rx_ampdu_factor = 0;
 		struct ieee80211_ht_cap *pht_cap = (struct ieee80211_ht_cap *)(p + 2);
 
-		pHT_caps_ie = p;
+		pht_caps_ie = p;
 
 		ht_cap = true;
 		network_type |= WIRELESS_11_24N;
@@ -1060,7 +1060,7 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf,  int len)
 		       &ie_len,
 		       (pbss_network->ie_length - _BEACON_IE_OFFSET_));
 	if (p && ie_len > 0)
-		pHT_info_ie = p;
+		pht_info_ie = p;
 
 	switch (network_type) {
 	case WIRELESS_11B:
@@ -1095,9 +1095,9 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf,  int len)
 		if (pregistrypriv->ampdu_enable == 1)
 			pmlmepriv->htpriv.ampdu_enable = true;
 
-		HT_caps_handler(padapter, (struct ndis_80211_var_ie *)pHT_caps_ie);
+		HT_caps_handler(padapter, (struct ndis_80211_var_ie *)pht_caps_ie);
 
-		HT_info_handler(padapter, (struct ndis_80211_var_ie *)pHT_info_ie);
+		HT_info_handler(padapter, (struct ndis_80211_var_ie *)pht_info_ie);
 	}
 
 	pbss_network->length =
Signature · 1 line
2.52.0
maintainer
#1 lore raw
Quoted 2 lines · Nikolay Kulikov

Rename "pHT_caps_ie" to "pht_caps_ie" and "pHT_info_ie" to "pht_info_ie" local variables to comply with Linux coding style.

Why did you pick these names? You kept the "p" prefix for some reason, which is "Hungarian" notation, and is not a kernel coding style, so shouldn't you just use a name that reflects what this variable is doing, and not encode the type in it?

thanks,

greg k-h

#2 lore raw
Quoted 4 lines · Greg KH

Why did you pick these names? You kept the "p" prefix for some reason, which is "Hungarian" notation, and is not a kernel coding style, so shouldn't you just use a name that reflects what this variable is doing, and not encode the type in it?

Hello, thanks for the feedback - you're absolurely right about the "Hungarian" notation. I should have removed the 'p' prefix,

I see that Rivka has already fixed "pHT_info_ie" (with Reviewed-by from Ethan Tidmore). To avoid duplication, i will send v2 that only fixes "pHT_caps_ie"

Thanks for teaching,
Nikolay

#3 lore raw

PATCH v2 1/1 staging: rtl8723bs: rename camelCase variable

In reply to Nikolay Kulikov

Rename "pHT_caps_ie" to "ht_caps_ie" local variable to comply with Linux kernel coding style.

This fixes the following checkpatch.pl warnings:
CHECK: Avoid CamelCase: <pHT_caps_ie>

---

Changes in v2:
- Remove "pHT_info_ie" renaming

 drivers/staging/rtl8723bs/core/rtw_ap.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/staging/rtl8723bs/core/rtw_ap.c +3 -3
index ebe73abab892..ecb92c8fd1e4 100644
@@ -800,7 +800,7 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf,  int len)
 {
 	int ret = _SUCCESS;
 	u8 *p;
-	u8 *pHT_caps_ie = NULL;
+	u8 *ht_caps_ie = NULL;
 	u8 *pHT_info_ie = NULL;
 	struct sta_info *psta = NULL;
 	u16 cap, ht_cap = false;
@@ -1006,7 +1006,7 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf,  int len)
 		u8 max_rx_ampdu_factor = 0;
 		struct ieee80211_ht_cap *pht_cap = (struct ieee80211_ht_cap *)(p + 2);
 
-		pHT_caps_ie = p;
+		ht_caps_ie = p;
 
 		ht_cap = true;
 		network_type |= WIRELESS_11_24N;
@@ -1094,7 +1094,7 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf,  int len)
 		if (pregistrypriv->ampdu_enable == 1)
 			pmlmepriv->htpriv.ampdu_enable = true;
 
-		HT_caps_handler(padapter, (struct ndis_80211_var_ie *)pHT_caps_ie);
+		HT_caps_handler(padapter, (struct ndis_80211_var_ie *)ht_caps_ie);
 
 		HT_info_handler(padapter, (struct ndis_80211_var_ie *)pHT_info_ie);
 	}
Signature · 1 line
2.53.0