Skip to contentSkip to conversation

staging: rtl8723bs: fix coding style issues (CamelCase)

PATCH Superseded Olivier Tanoh 2 participants 10 messages Jul 20 – Jul 28 Staging

lore
Share & tools
lore
#0 lore raw

cover staging: rtl8723bs: fix coding style issues (CamelCase)

This patch series resolves several checkpatch.pl warnings regarding the use of CamelCase variables and functions inside the rtl8723bs driver.

Olivier Tanoh (3):
staging: rtl8723bs: rename mBratesOS to avoid CamelCase
staging: rtl8723bs: rename Save_DM_Func_Flag functions to avoid
CamelCase
staging: rtl8723bs: rename Restore_DM_Func_Flag functions to avoid
CamelCase

 drivers/staging/rtl8723bs/core/rtw_mlme_ext.c    |  6 +++---
 drivers/staging/rtl8723bs/core/rtw_wlan_util.c   | 10 +++++-----
 drivers/staging/rtl8723bs/hal/hal_com.c          |  6 +++---
 drivers/staging/rtl8723bs/include/hal_com.h      |  2 +-
 drivers/staging/rtl8723bs/include/rtw_mlme_ext.h |  6 +++---
 5 files changed, 15 insertions(+), 15 deletions(-)
Signature · 1 line
2.34.1
#1 lore raw

PATCH 1/3 staging: rtl8723bs: rename mBratesOS to avoid CamelCase

Fix checkpatch.pl warning regarding the use of CamelCase:
CHECK: Avoid CamelCase: <mBratesOS>

Rename the struct member mBratesOS to comply with the Linux kernel coding style.

---
 drivers/staging/rtl8723bs/core/rtw_wlan_util.c   | 6 +++---
 drivers/staging/rtl8723bs/hal/hal_com.c          | 6 +++---
 drivers/staging/rtl8723bs/include/hal_com.h      | 2 +-
 drivers/staging/rtl8723bs/include/rtw_mlme_ext.h | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)
drivers/staging/rtl8723bs/core/rtw_wlan_util.c +3 -3
index 8b0502a1881b..84c7c9e8a748 100644
@@ -180,14 +180,14 @@ void set_mcs_rate_by_mask(u8 *mcs_set, u32 mask)
 	mcs_set[3] &= mcs_rate_4r;
 }
 
-void update_basic_rate_table(struct adapter *Adapter, u8 *mBratesOS)
+void update_basic_rate_table(struct adapter *Adapter, u8 *mb_rates_os)
 {
 	u8 i;
 	u8 rate;
 
 	/*  1M, 2M, 5.5M, 11M, 6M, 12M, 24M are mandatory. */
 	for (i = 0; i < NDIS_802_11_LENGTH_RATES_EX; i++) {
-		rate = mBratesOS[i] & 0x7f;
+		rate = mb_rates_os[i] & 0x7f;
 		switch (rate) {
 		case IEEE80211_CCK_RATE_1MB:
 		case IEEE80211_CCK_RATE_2MB:
@@ -196,7 +196,7 @@ void update_basic_rate_table(struct adapter *Adapter, u8 *mBratesOS)
 		case IEEE80211_OFDM_RATE_6MB:
 		case IEEE80211_OFDM_RATE_12MB:
 		case IEEE80211_OFDM_RATE_24MB:
-			mBratesOS[i] |= IEEE80211_BASIC_RATE_MASK;
+			mb_rates_os[i] |= IEEE80211_BASIC_RATE_MASK;
 			break;
 		}
 	}
drivers/staging/rtl8723bs/hal/hal_com.c +3 -3
index 80a775437751..b3c934833084 100644
@@ -247,13 +247,13 @@ u8 HwRateToMRate(u8 rate)
 	return ret_rate;
 }
 
-void HalSetBrateCfg(struct adapter *Adapter, u8 *mBratesOS, u16 *pBrateCfg)
+void HalSetBrateCfg(struct adapter *Adapter, u8 *mb_rates_os, u16 *pBrateCfg)
 {
 	u8 i, is_brate, brate;
 
 	for (i = 0; i < NDIS_802_11_LENGTH_RATES_EX; i++) {
-		is_brate = mBratesOS[i] & IEEE80211_BASIC_RATE_MASK;
-		brate = mBratesOS[i] & 0x7f;
+		is_brate = mb_rates_os[i] & IEEE80211_BASIC_RATE_MASK;
+		brate = mb_rates_os[i] & 0x7f;
 
 		if (is_brate) {
 			switch (brate) {
drivers/staging/rtl8723bs/include/hal_com.h +1 -1
index 7bbf62cfd825..95228f19493d 100644
@@ -112,7 +112,7 @@ u8 HwRateToMRate(u8 rate);
 
 void HalSetBrateCfg(
 	struct adapter *Adapter,
-	u8 *mBratesOS,
+	u8 *mb_rates_os,
 	u16	*pBrateCfg);
 
 bool
drivers/staging/rtl8723bs/include/rtw_mlme_ext.h +1 -1
index 0c2bd51b6bc2..14ba1dc7d7ef 100644
@@ -430,7 +430,7 @@ u8 networktype_to_raid_ex(struct adapter *adapter, struct sta_info *psta);
 
 void get_rate_set(struct adapter *padapter, unsigned char *pbssrate, int *bssrate_len);
 void set_mcs_rate_by_mask(u8 *mcs_set, u32 mask);
-void update_basic_rate_table(struct adapter *padapter, u8 *mBratesOS);
+void update_basic_rate_table(struct adapter *padapter, u8 *mb_rates_os);
 void update_basic_rate_table_soft_ap(u8 *bssrateset, u32 bssratelen);
 
 void Save_DM_Func_Flag(struct adapter *padapter);
Signature · 1 line
2.34.1
maintainer
#2 lore raw

Re: [PATCH 1/3] staging: rtl8723bs: rename mBratesOS to avoid CamelCase

Quoted 5 lines · Olivier Tanoh

Fix checkpatch.pl warning regarding the use of CamelCase:
CHECK: Avoid CamelCase: <mBratesOS>

Rename the struct member mBratesOS to comply with the Linux kernel coding style.

Why are you keeping the "m" and "b" here? Does that match up with what is really stored in this variable?

thanks,

greg k-h

#3 lore raw

Re: [PATCH 1/3] staging: rtl8723bs: rename mBratesOS to avoid CamelCase

Quoted 2 lines · Greg KH

Why are you keeping the "m" and "b" here? Does that match up with what is really stored in this variable?

You're right, the "m" and "b" prefixes are Hungarian notation and don't describe the content. The variable holds the basic rates array, so basic_rates is a clearer name. I'll send a v2.

Thanks for the review,
Olivier

Quoted 14 lines · Greg KH
Quoted 5 lines · Olivier Tanoh

Fix checkpatch.pl warning regarding the use of CamelCase:
CHECK: Avoid CamelCase: <mBratesOS>

Rename the struct member mBratesOS to comply with the Linux kernel coding style.

Why are you keeping the "m" and "b" here? Does that match up with what is really stored in this variable?

thanks,

greg k-h

#4 lore raw

v2 cover staging: rtl8723bs: fix coding style issues (CamelCase)

In reply to Greg KH

This series fixes CamelCase checkpatch warnings in rtl8723bs.

Changes in v2:
- Patch 1: rename to basic_rates instead of mb_rates_os, dropping the Hungarian notation prefixes as suggested by Greg KH.
- Patches 2 and 3: unchanged.

Olivier Tanoh (3):
staging: rtl8723bs: rename mBratesOS to avoid CamelCase
staging: rtl8723bs: rename Save_DM_Func_Flag functions to avoid
CamelCase
staging: rtl8723bs: rename Restore_DM_Func_Flag functions to avoid
CamelCase

 drivers/staging/rtl8723bs/core/rtw_mlme_ext.c    |  6 +++---
 drivers/staging/rtl8723bs/core/rtw_wlan_util.c   | 10 +++++-----
 drivers/staging/rtl8723bs/hal/hal_com.c          |  6 +++---
 drivers/staging/rtl8723bs/include/hal_com.h      |  2 +-
 drivers/staging/rtl8723bs/include/rtw_mlme_ext.h |  6 +++---
 5 files changed, 15 insertions(+), 15 deletions(-)
Signature · 1 line
2.34.1
#5 lore raw

PATCH v2 1/3 staging: rtl8723bs: rename mBratesOS to avoid CamelCase

Fix checkpatch.pl warning regarding the use of CamelCase:
CHECK: Avoid CamelCase: <mBratesOS>

Rename it to basic_rates, which describes the content of the variable, rather than keeping the Hungarian notation prefixes.

---
 drivers/staging/rtl8723bs/core/rtw_wlan_util.c   | 6 +++---
 drivers/staging/rtl8723bs/hal/hal_com.c          | 6 +++---
 drivers/staging/rtl8723bs/include/hal_com.h      | 2 +-
 drivers/staging/rtl8723bs/include/rtw_mlme_ext.h | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)
drivers/staging/rtl8723bs/core/rtw_wlan_util.c +3 -3
index 8b0502a1881b..627d778fb093 100644
@@ -180,14 +180,14 @@ void set_mcs_rate_by_mask(u8 *mcs_set, u32 mask)
 	mcs_set[3] &= mcs_rate_4r;
 }
 
-void update_basic_rate_table(struct adapter *Adapter, u8 *mBratesOS)
+void update_basic_rate_table(struct adapter *Adapter, u8 *basic_rates)
 {
 	u8 i;
 	u8 rate;
 
 	/*  1M, 2M, 5.5M, 11M, 6M, 12M, 24M are mandatory. */
 	for (i = 0; i < NDIS_802_11_LENGTH_RATES_EX; i++) {
-		rate = mBratesOS[i] & 0x7f;
+		rate = basic_rates[i] & 0x7f;
 		switch (rate) {
 		case IEEE80211_CCK_RATE_1MB:
 		case IEEE80211_CCK_RATE_2MB:
@@ -196,7 +196,7 @@ void update_basic_rate_table(struct adapter *Adapter, u8 *mBratesOS)
 		case IEEE80211_OFDM_RATE_6MB:
 		case IEEE80211_OFDM_RATE_12MB:
 		case IEEE80211_OFDM_RATE_24MB:
-			mBratesOS[i] |= IEEE80211_BASIC_RATE_MASK;
+			basic_rates[i] |= IEEE80211_BASIC_RATE_MASK;
 			break;
 		}
 	}
drivers/staging/rtl8723bs/hal/hal_com.c +3 -3
index 80a775437751..2f472afc5261 100644
@@ -247,13 +247,13 @@ u8 HwRateToMRate(u8 rate)
 	return ret_rate;
 }
 
-void HalSetBrateCfg(struct adapter *Adapter, u8 *mBratesOS, u16 *pBrateCfg)
+void HalSetBrateCfg(struct adapter *Adapter, u8 *basic_rates, u16 *pBrateCfg)
 {
 	u8 i, is_brate, brate;
 
 	for (i = 0; i < NDIS_802_11_LENGTH_RATES_EX; i++) {
-		is_brate = mBratesOS[i] & IEEE80211_BASIC_RATE_MASK;
-		brate = mBratesOS[i] & 0x7f;
+		is_brate = basic_rates[i] & IEEE80211_BASIC_RATE_MASK;
+		brate = basic_rates[i] & 0x7f;
 
 		if (is_brate) {
 			switch (brate) {
drivers/staging/rtl8723bs/include/hal_com.h +1 -1
index 7bbf62cfd825..17bce0f88bac 100644
@@ -112,7 +112,7 @@ u8 HwRateToMRate(u8 rate);
 
 void HalSetBrateCfg(
 	struct adapter *Adapter,
-	u8 *mBratesOS,
+	u8 *basic_rates,
 	u16	*pBrateCfg);
 
 bool
drivers/staging/rtl8723bs/include/rtw_mlme_ext.h +1 -1
index 0c2bd51b6bc2..ed6c5001c68a 100644
@@ -430,7 +430,7 @@ u8 networktype_to_raid_ex(struct adapter *adapter, struct sta_info *psta);
 
 void get_rate_set(struct adapter *padapter, unsigned char *pbssrate, int *bssrate_len);
 void set_mcs_rate_by_mask(u8 *mcs_set, u32 mask);
-void update_basic_rate_table(struct adapter *padapter, u8 *mBratesOS);
+void update_basic_rate_table(struct adapter *padapter, u8 *basic_rates);
 void update_basic_rate_table_soft_ap(u8 *bssrateset, u32 bssratelen);
 
 void Save_DM_Func_Flag(struct adapter *padapter);
Signature · 1 line
2.34.1
#6 lore raw

PATCH v2 2/3 staging: rtl8723bs: rename Save_DM_Func_Flag functions to avoid CamelCase

In reply to Olivier Tanoh

Rename Save_DM_Func_Flag and Restore_DM_Func_Flag to snake_case format to comply with the Linux kernel coding style.

---
 drivers/staging/rtl8723bs/core/rtw_mlme_ext.c    | 4 ++--
 drivers/staging/rtl8723bs/core/rtw_wlan_util.c   | 2 +-
 drivers/staging/rtl8723bs/include/rtw_mlme_ext.h | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +2 -2
index f5ab94a2d0a0..ff5e5fae3ef2 100644
@@ -5144,7 +5144,7 @@ u8 createbss_hdl(struct adapter *padapter, u8 *pbuf)
 		pmlmeinfo->candidate_tid_bitmap = 0;
 
 		/* disable dynamic functions, such as high power, DIG */
-		Save_DM_Func_Flag(padapter);
+		save_dm_func_flag(padapter);
 		switch_dm_func(padapter, DYNAMIC_FUNC_DISABLE, false);
 
 		/* config the initial gain under linking, need to write the BB registers */
@@ -5452,7 +5452,7 @@ u8 sitesurvey_cmd_hdl(struct adapter *padapter, u8 *pbuf)
 	if ((pmlmeext->sitesurvey_res.state == SCAN_START) ||
 	    (pmlmeext->sitesurvey_res.state == SCAN_TXNULL)) {
 		/* disable dynamic functions, such as high power, DIG */
-		Save_DM_Func_Flag(padapter);
+		save_dm_func_flag(padapter);
 		switch_dm_func(padapter, DYNAMIC_FUNC_DISABLE, false);
 
 		/* config the initial gain under scanning, need to write the BB
drivers/staging/rtl8723bs/core/rtw_wlan_util.c +1 -1
index 627d778fb093..c5d1bc77bfa0 100644
@@ -220,7 +220,7 @@ void update_basic_rate_table_soft_ap(u8 *bssrateset, u32 bssratelen)
 	}
 }
 
-void Save_DM_Func_Flag(struct adapter *padapter)
+void save_dm_func_flag(struct adapter *padapter)
 {
 	u8 bSaveFlag = true;
 
drivers/staging/rtl8723bs/include/rtw_mlme_ext.h +1 -1
index ed6c5001c68a..2cd10810f9e9 100644
@@ -433,7 +433,7 @@ void set_mcs_rate_by_mask(u8 *mcs_set, u32 mask);
 void update_basic_rate_table(struct adapter *padapter, u8 *basic_rates);
 void update_basic_rate_table_soft_ap(u8 *bssrateset, u32 bssratelen);
 
-void Save_DM_Func_Flag(struct adapter *padapter);
+void save_dm_func_flag(struct adapter *padapter);
 void Restore_DM_Func_Flag(struct adapter *padapter);
 void switch_dm_func(struct adapter *padapter, u32 mode, u8 enable);
 
Signature · 1 line
2.34.1
#7 lore raw

PATCH v2 3/3 staging: rtl8723bs: rename Restore_DM_Func_Flag functions to avoid CamelCase

In reply to Olivier Tanoh

Rename Restore_DM_Func_Flag to snake_case format to comply with the Linux kernel coding style.

---
 drivers/staging/rtl8723bs/core/rtw_mlme_ext.c    | 2 +-
 drivers/staging/rtl8723bs/core/rtw_wlan_util.c   | 2 +-
 drivers/staging/rtl8723bs/include/rtw_mlme_ext.h | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +1 -1
index ff5e5fae3ef2..f7b11d2a5abd 100644
@@ -3812,7 +3812,7 @@ void site_survey(struct adapter *padapter)
 			initialgain = 0xff; /* restore RX GAIN */
 			rtw_hal_set_hwreg(padapter, HW_VAR_INITIAL_GAIN, (u8 *)(&initialgain));
 			/* turn on dynamic functions */
-			Restore_DM_Func_Flag(padapter);
+			restore_dm_func_flag(padapter);
 			/* switch_dm_func(padapter, DYNAMIC_ALL_FUNC_ENABLE, true); */
 
 			if (is_client_associated_to_ap(padapter))
drivers/staging/rtl8723bs/core/rtw_wlan_util.c +1 -1
index c5d1bc77bfa0..065f8666f117 100644
@@ -227,7 +227,7 @@ void save_dm_func_flag(struct adapter *padapter)
 	rtw_hal_set_hwreg(padapter, HW_VAR_DM_FUNC_OP, (u8 *)(&bSaveFlag));
 }
 
-void Restore_DM_Func_Flag(struct adapter *padapter)
+void restore_dm_func_flag(struct adapter *padapter)
 {
 	u8 bSaveFlag = false;
 
drivers/staging/rtl8723bs/include/rtw_mlme_ext.h +1 -1
index 2cd10810f9e9..e61905201194 100644
@@ -434,7 +434,7 @@ void update_basic_rate_table(struct adapter *padapter, u8 *basic_rates);
 void update_basic_rate_table_soft_ap(u8 *bssrateset, u32 bssratelen);
 
 void save_dm_func_flag(struct adapter *padapter);
-void Restore_DM_Func_Flag(struct adapter *padapter);
+void restore_dm_func_flag(struct adapter *padapter);
 void switch_dm_func(struct adapter *padapter, u32 mode, u8 enable);
 
 void set_msr(struct adapter *padapter, u8 type);
Signature · 1 line
2.34.1
#8 lore raw

PATCH 2/3 staging: rtl8723bs: rename Save_DM_Func_Flag functions to avoid CamelCase

In reply to Olivier Tanoh

Rename Save_DM_Func_Flag and Restore_DM_Func_Flag to snake_case format to comply with the Linux kernel coding style.

---
 drivers/staging/rtl8723bs/core/rtw_mlme_ext.c    | 4 ++--
 drivers/staging/rtl8723bs/core/rtw_wlan_util.c   | 2 +-
 drivers/staging/rtl8723bs/include/rtw_mlme_ext.h | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +2 -2
index f5ab94a2d0a0..ff5e5fae3ef2 100644
@@ -5144,7 +5144,7 @@ u8 createbss_hdl(struct adapter *padapter, u8 *pbuf)
 		pmlmeinfo->candidate_tid_bitmap = 0;
 
 		/* disable dynamic functions, such as high power, DIG */
-		Save_DM_Func_Flag(padapter);
+		save_dm_func_flag(padapter);
 		switch_dm_func(padapter, DYNAMIC_FUNC_DISABLE, false);
 
 		/* config the initial gain under linking, need to write the BB registers */
@@ -5452,7 +5452,7 @@ u8 sitesurvey_cmd_hdl(struct adapter *padapter, u8 *pbuf)
 	if ((pmlmeext->sitesurvey_res.state == SCAN_START) ||
 	    (pmlmeext->sitesurvey_res.state == SCAN_TXNULL)) {
 		/* disable dynamic functions, such as high power, DIG */
-		Save_DM_Func_Flag(padapter);
+		save_dm_func_flag(padapter);
 		switch_dm_func(padapter, DYNAMIC_FUNC_DISABLE, false);
 
 		/* config the initial gain under scanning, need to write the BB
drivers/staging/rtl8723bs/core/rtw_wlan_util.c +1 -1
index 84c7c9e8a748..155564bb7251 100644
@@ -220,7 +220,7 @@ void update_basic_rate_table_soft_ap(u8 *bssrateset, u32 bssratelen)
 	}
 }
 
-void Save_DM_Func_Flag(struct adapter *padapter)
+void save_dm_func_flag(struct adapter *padapter)
 {
 	u8 bSaveFlag = true;
 
drivers/staging/rtl8723bs/include/rtw_mlme_ext.h +1 -1
index 14ba1dc7d7ef..08f8e722fd03 100644
@@ -433,7 +433,7 @@ void set_mcs_rate_by_mask(u8 *mcs_set, u32 mask);
 void update_basic_rate_table(struct adapter *padapter, u8 *mb_rates_os);
 void update_basic_rate_table_soft_ap(u8 *bssrateset, u32 bssratelen);
 
-void Save_DM_Func_Flag(struct adapter *padapter);
+void save_dm_func_flag(struct adapter *padapter);
 void Restore_DM_Func_Flag(struct adapter *padapter);
 void switch_dm_func(struct adapter *padapter, u32 mode, u8 enable);
 
Signature · 1 line
2.34.1
#9 lore raw

PATCH 3/3 staging: rtl8723bs: rename Restore_DM_Func_Flag functions to avoid CamelCase

In reply to Olivier Tanoh

Rename Restore_DM_Func_Flag to snake_case format to comply with the Linux kernel coding style.

---
 drivers/staging/rtl8723bs/core/rtw_mlme_ext.c    | 2 +-
 drivers/staging/rtl8723bs/core/rtw_wlan_util.c   | 2 +-
 drivers/staging/rtl8723bs/include/rtw_mlme_ext.h | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +1 -1
index ff5e5fae3ef2..f7b11d2a5abd 100644
@@ -3812,7 +3812,7 @@ void site_survey(struct adapter *padapter)
 			initialgain = 0xff; /* restore RX GAIN */
 			rtw_hal_set_hwreg(padapter, HW_VAR_INITIAL_GAIN, (u8 *)(&initialgain));
 			/* turn on dynamic functions */
-			Restore_DM_Func_Flag(padapter);
+			restore_dm_func_flag(padapter);
 			/* switch_dm_func(padapter, DYNAMIC_ALL_FUNC_ENABLE, true); */
 
 			if (is_client_associated_to_ap(padapter))
drivers/staging/rtl8723bs/core/rtw_wlan_util.c +1 -1
index 155564bb7251..8726796379f8 100644
@@ -227,7 +227,7 @@ void save_dm_func_flag(struct adapter *padapter)
 	rtw_hal_set_hwreg(padapter, HW_VAR_DM_FUNC_OP, (u8 *)(&bSaveFlag));
 }
 
-void Restore_DM_Func_Flag(struct adapter *padapter)
+void restore_dm_func_flag(struct adapter *padapter)
 {
 	u8 bSaveFlag = false;
 
drivers/staging/rtl8723bs/include/rtw_mlme_ext.h +1 -1
index 08f8e722fd03..679e88de4baa 100644
@@ -434,7 +434,7 @@ void update_basic_rate_table(struct adapter *padapter, u8 *mb_rates_os);
 void update_basic_rate_table_soft_ap(u8 *bssrateset, u32 bssratelen);
 
 void save_dm_func_flag(struct adapter *padapter);
-void Restore_DM_Func_Flag(struct adapter *padapter);
+void restore_dm_func_flag(struct adapter *padapter);
 void switch_dm_func(struct adapter *padapter, u32 mode, u8 enable);
 
 void set_msr(struct adapter *padapter, u8 type);
Signature · 1 line
2.34.1