[PATCH 0/3] staging: rtl8723bs: Fix multiple trailing semicolons

[PATCH 0/3] staging: rtl8723bs: Fix multiple trailing semicolons

[Luis de Bethencourt]

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(-)

-- 
2.15.1

[PATCH 1/3] staging: rtl8723bs: Fix trailing semicolon

[Luis de Bethencourt]

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

Signed-off-by: Luis de Bethencourt <luisbg@kernel.org>
---
 drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c b/drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c
index c16e147d8adc..a99a863be656 100644
--- a/drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c
+++ b/drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c
@@ -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));
-- 
2.15.1

[PATCH 2/3] staging: rtl8723bs: Fix trailing semicolon

[Luis de Bethencourt]

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

Signed-off-by: Luis de Bethencourt <luisbg@kernel.org>
---
 drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c b/drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c
index 21ec890fd60c..e34d133075c0 100644
--- a/drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c
+++ b/drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c
@@ -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 {
-- 
2.15.1

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

[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.

Signed-off-by: Luis de Bethencourt <luisbg@kernel.org>
---
 drivers/staging/rtl8723bs/core/rtw_mlme.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rtl8723bs/core/rtw_mlme.c
index fe739eb2cf7d..7d1f19b2960d 100644
--- a/drivers/staging/rtl8723bs/core/rtw_mlme.c
+++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c
@@ -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;
-- 
2.15.1

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

[Dan Carpenter]

On Wed, Jan 10, 2018 at 01:50:38PM +0000, Luis de Bethencourt wrote:
> 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