Skip to contentSkip to conversation

staging: rtl8723bs: clean up CamelCase style warnings

PATCH In review Bruce Ou 2 participants 5 messages Jun 23 – Jul 7 Staging

lore
Share & tools
lore

Bruce Ou

author
#0 lore raw

v2 cover staging: rtl8723bs: clean up CamelCase style warnings

Changes in v2:
- Split the single comprehensive patch into a patchset of 3 logical parts as requested by Dan Carpenter.
- Worked against the latest staging/staging-next branch.

Bruce Ou (3):
staging: rtl8723bs: fix CamelCase warning for bResult
staging: rtl8723bs: fix CamelCase warning for Address
staging: rtl8723bs: fix remaining CamelCase local variables

 drivers/staging/rtl8723bs/core/rtw_efuse.c | 54 +++++++++++-----------
 1 file changed, 27 insertions(+), 27 deletions(-)
Signature · 1 line
2.43.0
author
#1 lore raw

PATCH v2 1/3 staging: rtl8723bs: fix CamelCase warning for bResult

Fix the coding style warning reported by checkpatch.pl regarding the CamelCase local variable bResult by renaming it to result.

No functional changes are introduced.

---
Changes in v2:
- Split from a single comprehensive patch into a standalone patch.

 drivers/staging/rtl8723bs/core/rtw_efuse.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/staging/rtl8723bs/core/rtw_efuse.c +4 -4
index a40d6eab7249..4bf205e078e7 100644
@@ -89,7 +89,7 @@ u16	addr,
 u8	*data)
 {
 	u32 tmpidx = 0;
-	u8 bResult;
+	u8 result;
 	u8 readbyte;
 
 	/*  <20130121, Kordan> For SMIC EFUSE specificatoin. */
@@ -114,13 +114,13 @@ u8	*data)
 	}
 	if (tmpidx < 100) {
 		*data = rtw_read8(padapter, EFUSE_CTRL);
-		bResult = true;
+		result = true;
 	} else {
 		*data = 0xff;
-		bResult = false;
+		result = false;
 	}
 
-	return bResult;
+	return result;
 }
 
 /*-----------------------------------------------------------------------------
Signature · 1 line
2.43.0
#2 lore raw

Re: [PATCH v2 1/3] staging: rtl8723bs: fix CamelCase warning for bResult

Quoted 18 lines · Bruce Ou

Fix the coding style warning reported by checkpatch.pl regarding the CamelCase local variable bResult by renaming it to result.

No functional changes are introduced.

---
Changes in v2:
- Split from a single comprehensive patch into a standalone patch.

 drivers/staging/rtl8723bs/core/rtw_efuse.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/staging/rtl8723bs/core/rtw_efuse.c +0 -0
index a40d6eab7249..4bf205e078e7 100644

drivers/staging/rtl8723bs/core/rtw_efuse.c u16 addr, · line 92

Quoted 5 lines
drivers/staging/rtl8723bs/core/rtw_efuse.c +1 -1
@@ -89,7 +89,7 @@ u16	addr,
 u8	*data)
 {
 	u32 tmpidx = 0;
-	u8 bResult;
+	u8 result;

Why isn't this a boolean variable now?

thanks,

greg k-h

author
#3 lore raw

PATCH v2 2/3 staging: rtl8723bs: fix CamelCase warning for Address

In reply to Bruce Ou

Fix the coding style warning reported by checkpatch.pl regarding the CamelCase local variable Address by renaming it to address.

No functional changes are introduced.

---
Changes in v2:
- Split from a single comprehensive patch into a standalone patch.

 drivers/staging/rtl8723bs/core/rtw_efuse.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/staging/rtl8723bs/core/rtw_efuse.c +4 -4
index 4bf205e078e7..6767c6bbaa1b 100644
@@ -44,7 +44,7 @@ rtw_efuse_calculate_word_counts(u8 word_en)
 u8
 rtw_efuse_read_1_byte(
 struct adapter *Adapter,
-u16		Address)
+u16		address)
 {
 	u8 Bytetemp = {0x00};
 	u8 temp = {0x00};
@@ -53,13 +53,13 @@ u16		Address)
 
 	Hal_GetEfuseDefinition(Adapter, EFUSE_WIFI, TYPE_EFUSE_REAL_CONTENT_LEN, &contentLen);
 
-	if (Address < contentLen) {/* E-fuse 512Byte */
+	if (address < contentLen) {/* E-fuse 512Byte */
 		/* Write E-fuse Register address bit0~7 */
-		temp = Address & 0xFF;
+		temp = address & 0xFF;
 		rtw_write8(Adapter, EFUSE_CTRL + 1, temp);
 		Bytetemp = rtw_read8(Adapter, EFUSE_CTRL + 2);
 		/* Write E-fuse Register address bit8~9 */
-		temp = ((Address >> 8) & 0x03) | (Bytetemp & 0xFC);
+		temp = ((address >> 8) & 0x03) | (Bytetemp & 0xFC);
 		rtw_write8(Adapter, EFUSE_CTRL + 2, temp);
 
 		/* Write 0x30[31]= 0 */
Signature · 1 line
2.43.0
author
#4 lore raw

PATCH v2 3/3 staging: rtl8723bs: fix remaining CamelCase local variables

In reply to Bruce Ou

Fix coding style warnings reported by checkpatch.pl regarding the remaining CamelCase local variables in rtw_efuse.c. This includes variables like contentLen, mapLen, efuseType, and Bytetemp.

No functional changes are introduced.

---
Changes in v2:
- Split from a single comprehensive patch into a standalone patch.

 drivers/staging/rtl8723bs/core/rtw_efuse.c | 38 +++++++++++-----------
 1 file changed, 19 insertions(+), 19 deletions(-)
drivers/staging/rtl8723bs/core/rtw_efuse.c +20 -20
index 6767c6bbaa1b..b1d32f211102 100644
@@ -46,31 +46,31 @@ rtw_efuse_read_1_byte(
 struct adapter *Adapter,
 u16		address)
 {
-	u8 Bytetemp = {0x00};
+	u8 byte_temp = {0x00};
 	u8 temp = {0x00};
 	u32 k = 0;
-	u16 contentLen = 0;
+	u16 content_len = 0;
 
-	Hal_GetEfuseDefinition(Adapter, EFUSE_WIFI, TYPE_EFUSE_REAL_CONTENT_LEN, &contentLen);
+	Hal_GetEfuseDefinition(Adapter, EFUSE_WIFI, TYPE_EFUSE_REAL_CONTENT_LEN, &content_len);
 
-	if (address < contentLen) {/* E-fuse 512Byte */
+	if (address < content_len) {/* E-fuse 512Byte */
 		/* Write E-fuse Register address bit0~7 */
 		temp = address & 0xFF;
 		rtw_write8(Adapter, EFUSE_CTRL + 1, temp);
-		Bytetemp = rtw_read8(Adapter, EFUSE_CTRL + 2);
+		byte_temp = rtw_read8(Adapter, EFUSE_CTRL + 2);
 		/* Write E-fuse Register address bit8~9 */
 		temp = ((address >> 8) & 0x03) | (byte_temp & 0xFC);
 		rtw_write8(Adapter, EFUSE_CTRL + 2, temp);
 
 		/* Write 0x30[31]= 0 */
-		Bytetemp = rtw_read8(Adapter, EFUSE_CTRL + 3);
-		temp = Bytetemp & 0x7F;
+		byte_temp = rtw_read8(Adapter, EFUSE_CTRL + 3);
+		temp = byte_temp & 0x7F;
 		rtw_write8(Adapter, EFUSE_CTRL + 3, temp);
 
 		/* Wait Write-ready (0x30[31]= 1) */
-		Bytetemp = rtw_read8(Adapter, EFUSE_CTRL + 3);
-		while (!(Bytetemp & 0x80)) {
-			Bytetemp = rtw_read8(Adapter, EFUSE_CTRL + 3);
+		byte_temp = rtw_read8(Adapter, EFUSE_CTRL + 3);
+		while (!(byte_temp & 0x80)) {
+			byte_temp = rtw_read8(Adapter, EFUSE_CTRL + 3);
 			k++;
 			if (k == 1000)
 				break;
@@ -139,15 +139,15 @@ u8	*data)
  * 11/11/2008	MHC		Create Version 0.
  *
  */
-static void Efuse_ReadAllMap(struct adapter *padapter, u8 efuseType, u8 *Efuse)
+static void Efuse_ReadAllMap(struct adapter *padapter, u8 efuse_type, u8 *Efuse)
 {
-	u16 mapLen = 0;
+	u16 map_len = 0;
 
 	Hal_EfusePowerSwitch(padapter, true);
 
-	Hal_GetEfuseDefinition(padapter, efuseType, TYPE_EFUSE_MAP_LEN, &mapLen);
+	Hal_GetEfuseDefinition(padapter, efuse_type, TYPE_EFUSE_MAP_LEN, &map_len);
 
-	Hal_ReadEFuse(padapter, efuseType, 0, mapLen, Efuse);
+	Hal_ReadEFuse(padapter, efuse_type, 0, map_len, Efuse);
 
 	Hal_EfusePowerSwitch(padapter, false);
 }
@@ -216,20 +216,20 @@ static void efuse_ShadowRead4Byte(struct adapter *padapter, u16 Offset, u32 *Val
  * 11/13/2008	MHC		Create Version 0.
  *
  */
-void rtw_efuse_shadow_map_update(struct adapter *padapter, u8 efuseType)
+void rtw_efuse_shadow_map_update(struct adapter *padapter, u8 efuse_type)
 {
 	struct eeprom_priv *pEEPROM = GET_EEPROM_EFUSE_PRIV(padapter);
-	u16 mapLen = 0;
+	u16 map_len = 0;
 
-	Hal_GetEfuseDefinition(padapter, efuseType, TYPE_EFUSE_MAP_LEN, &mapLen);
+	Hal_GetEfuseDefinition(padapter, efuse_type, TYPE_EFUSE_MAP_LEN, &map_len);
 
 	if (pEEPROM->bautoload_fail_flag)
-		memset(pEEPROM->efuse_eeprom_data, 0xFF, mapLen);
+		memset(pEEPROM->efuse_eeprom_data, 0xFF, map_len);
 	else
-		Efuse_ReadAllMap(padapter, efuseType, pEEPROM->efuse_eeprom_data);
+		Efuse_ReadAllMap(padapter, efuse_type, pEEPROM->efuse_eeprom_data);
 
 	/* PlatformMoveMemory((void *)&pHalData->EfuseMap[EFUSE_MODIFY_MAP][0], */
-	/* void *)&pHalData->EfuseMap[EFUSE_INIT_MAP][0], mapLen); */
+	/* void *)&pHalData->EfuseMap[EFUSE_INIT_MAP][0], map_len); */
 } /*  rtw_efuse_shadow_map_update */
 
 /*-----------------------------------------------------------------------------
Signature · 1 line
2.43.0