Skip to contentSkip to conversation

staging: rtl8723bs: Fix multiple trailing semicolons

PATCH Superseded Luis de Bethencourt 2 participants 5 messages Jan 10, 2018 Staging

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

cover staging: rtl8723bs: Fix multiple trailing semicolons

Hi,

This is a follow-up of yesterday's water-testing patch [0]. Just 3 more similar cases of trailing semicolons.

Sending them separately to atomize the changes, but happy to merge them all into one. It is easier to first try separate and later merge if people want me to.

In patch 3/3, not sure why this file has so many lines of commented out code. Maybe I should remove the commented out code instead. pcur_network is clearly not being used. What do you all think?

Over the weekend I will start running a mainline kernel on my CHIP, and looking at this driver in more depth. Fun!

Thanks,
Luis

[0] Sorry I don't have a link, LKML is down

Luis de Bethencourt (3):
staging: rtl8723bs: Fix trailing semicolon
staging: rtl8723bs: Fix trailing semicolon
staging: rtl8723bs: Fix trailing semicolon in comment

 drivers/staging/rtl8723bs/core/rtw_mlme.c       | 2 +-
 drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c  | 2 +-
 drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
Signature · 1 line
2.15.1
#1 lore raw

PATCH 1/3 staging: rtl8723bs: Fix trailing semicolon

The trailing semicolon is an empty statement that does no operation. Removing it since it doesn't do anything.

---
 drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c +1 -1
index c16e147d8adc..a99a863be656 100644
@@ -1052,7 +1052,7 @@ static u8 phy_PathB_RxIQK8723B(struct adapter *padapter, bool configPathB)
 
 	/*  Check failed */
 	regEAC = PHY_QueryBBReg(pDM_Odm->Adapter, rRx_Power_After_IQK_A_2, bMaskDWord);
-	regEA4 = PHY_QueryBBReg(pDM_Odm->Adapter, rRx_Power_Before_IQK_A_2, bMaskDWord);;
+	regEA4 = PHY_QueryBBReg(pDM_Odm->Adapter, rRx_Power_Before_IQK_A_2, bMaskDWord);
 
 	ODM_RT_TRACE(pDM_Odm, ODM_COMP_CALIBRATION, ODM_DBG_LOUD,  ("0xeac = 0x%x\n", regEAC));
 	ODM_RT_TRACE(pDM_Odm, ODM_COMP_CALIBRATION, ODM_DBG_LOUD, ("0xea4 = 0x%x, 0xeac = 0x%x\n", regEA4, regEAC));
Signature · 1 line
2.15.1
#2 lore raw

PATCH 2/3 staging: rtl8723bs: Fix trailing semicolon

In reply to Luis de Bethencourt

The trailing semicolon is an empty statement that does nothing. Removing it since it has no purpose.

---
 drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c +1 -1
index 21ec890fd60c..e34d133075c0 100644
@@ -153,7 +153,7 @@ static u32 phy_RFSerialRead_8723B(
 	NewOffset = Offset;
 
 	if (eRFPath == RF_PATH_A) {
-		tmplong2 = PHY_QueryBBReg(Adapter, rFPGA0_XA_HSSIParameter2|MaskforPhySet, bMaskDWord);;
+		tmplong2 = PHY_QueryBBReg(Adapter, rFPGA0_XA_HSSIParameter2|MaskforPhySet, bMaskDWord);
 		tmplong2 = (tmplong2 & (~bLSSIReadAddress)) | (NewOffset<<23) | bLSSIReadEdge;	/* T65 RF */
 		PHY_SetBBReg(Adapter, rFPGA0_XA_HSSIParameter2|MaskforPhySet, bMaskDWord, tmplong2&(~bLSSIReadEdge));
 	} else {
Signature · 1 line
2.15.1
#3 lore raw

PATCH 3/3 staging: rtl8723bs: Fix trailing semicolon in comment

In reply to Luis de Bethencourt

Even though the code is commented out, it has a small bug. The trailing semicolon is an empty statement that does no operation. Removing it since it doesn't do anything.

---
 drivers/staging/rtl8723bs/core/rtw_mlme.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/rtl8723bs/core/rtw_mlme.c +1 -1
index fe739eb2cf7d..7d1f19b2960d 100644
@@ -2889,7 +2889,7 @@ void rtw_update_ht_cap(struct adapter *padapter, u8 *pie, uint ie_len, u8 channe
 	struct ht_priv 	*phtpriv = &pmlmepriv->htpriv;
 	/* struct recv_priv *precvpriv = &padapter->recvpriv; */
 	struct registry_priv *pregistrypriv = &padapter->registrypriv;
-	/* struct wlan_network *pcur_network = &(pmlmepriv->cur_network);; */
+	/* struct wlan_network *pcur_network = &(pmlmepriv->cur_network); */
 	struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
 	struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
 	u8 cbw40_enable = 0;
Signature · 1 line
2.15.1
#4 lore raw

Re: [PATCH 3/3] staging: rtl8723bs: Fix trailing semicolon in comment

Quoted 3 lines · Luis de Bethencourt

Even though the code is commented out, it has a small bug. The trailing semicolon is an empty statement that does no operation. Removing it since it doesn't do anything.

It's not a bug because it's totally harmless to add extra semicolons.

But it's better to just delete all the commented out lines. I don't really want to see a bunch of patches to code which should just be deleted.

regards,
dan carpenter