Skip to contentSkip to conversation

staging: rtl8723bs: block comment formatting fixes

PATCH New Jennifer Guo 1 participant 3 messages May 9 Staging

lore
Share & tools
lore
#0 lore raw

cover staging: rtl8723bs: block comment formatting fixes

This patchset addresses two separate block comment related checkpatch.pl warnings in hal/ source files.

No functional changes.

Jennifer Guo (2):
staging: rtl8723bs: fix block comment alignment in hal/ source files
staging: rtl8723bs: move block comment terminator to new line

 .../staging/rtl8723bs/hal/HalPhyRf_8723B.c    |  3 +-
 drivers/staging/rtl8723bs/hal/hal_com.c       | 28 ++++++++--------
 .../staging/rtl8723bs/hal/hal_com_phycfg.c    |  6 ++--
 drivers/staging/rtl8723bs/hal/odm.c           | 32 +++++++++----------
 drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c  | 14 ++++----
 .../staging/rtl8723bs/hal/rtl8723b_rf6052.c   |  5 +--
 6 files changed, 45 insertions(+), 43 deletions(-)
Signature · 1 line
2.34.1
#1 lore raw

PATCH 1/2 staging: rtl8723bs: fix block comment alignment in hal/ source files

Add leading whitespace to block comments in order to adhere to the kernel coding style.

This fixes the following checkpatch.pl warning:
WARNING: Block comments should align the * on each line.

---
 drivers/staging/rtl8723bs/hal/hal_com.c       | 28 ++++++++--------
 .../staging/rtl8723bs/hal/hal_com_phycfg.c    |  6 ++--
 drivers/staging/rtl8723bs/hal/odm.c           | 32 +++++++++----------
 drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c  | 14 ++++----
 .../staging/rtl8723bs/hal/rtl8723b_rf6052.c   |  2 +-
 5 files changed, 41 insertions(+), 41 deletions(-)
drivers/staging/rtl8723bs/hal/hal_com.c +14 -14
index 25686aeb073b..51dbb21345f8 100644
@@ -435,10 +435,10 @@ void rtw_init_hal_com_default_value(struct adapter *Adapter)
 }
 
 /*
-* C2H event format:
-* Field	 TRIGGER		CONTENT	   CMD_SEQ	CMD_LEN		 CMD_ID
-* BITS	 [127:120]	[119:16]      [15:8]		  [7:4]		   [3:0]
-*/
+ * C2H event format:
+ * Field	 TRIGGER		CONTENT	   CMD_SEQ	CMD_LEN		 CMD_ID
+ * BITS	 [127:120]	[119:16]      [15:8]		  [7:4]		   [3:0]
+ */
 
 void c2h_evt_clear(struct adapter *adapter)
 {
@@ -446,10 +446,10 @@ void c2h_evt_clear(struct adapter *adapter)
 }
 
 /*
-* C2H event format:
-* Field    TRIGGER    CMD_LEN    CONTENT    CMD_SEQ    CMD_ID
-* BITS    [127:120]   [119:112]    [111:16]	     [15:8]         [7:0]
-*/
+ * C2H event format:
+ * Field    TRIGGER    CMD_LEN    CONTENT    CMD_SEQ    CMD_ID
+ * BITS    [127:120]   [119:112]    [111:16]	     [15:8]         [7:0]
+ */
 s32 c2h_evt_read_88xx(struct adapter *adapter, u8 *buf)
 {
 	s32 ret = _FAIL;
@@ -483,9 +483,9 @@ s32 c2h_evt_read_88xx(struct adapter *adapter, u8 *buf)
 
 clear_evt:
 	/*
-	* Clear event to notify FW we have read the command.
-	* If this field isn't clear, the FW won't update the next command message.
-	*/
+	 * Clear event to notify FW we have read the command.
+	 * If this field isn't clear, the FW won't update the next command message.
+	 */
 	c2h_evt_clear(adapter);
 exit:
 	return ret;
@@ -582,9 +582,9 @@ void SetHwReg(struct adapter *adapter, u8 variable, u8 *val)
 		break;
 	case HW_VAR_DM_FUNC_CLR:
 		/*
-		* input is already a mask to clear function
-		* don't invert it again! George, Lucas@20130513
-		*/
+		 * input is already a mask to clear function
+		 * don't invert it again! George, Lucas@20130513
+		 */
 		odm->SupportAbility &= *((u32 *)val);
 		break;
 	case HW_VAR_AMPDU_MIN_SPACE:
drivers/staging/rtl8723bs/hal/hal_com_phycfg.c +3 -3
index 1e5669b17d0f..ea79e300f83b 100644
@@ -407,9 +407,9 @@ struct adapter *padapter
 }
 
 /*
-  * This function must be called if the value in the PHY_REG_PG.txt(or header)
-  * is exact dBm values
-  */
+ * This function must be called if the value in the PHY_REG_PG.txt(or header)
+ * is exact dBm values
+ */
 void PHY_TxPowerByRateConfiguration(struct adapter *padapter)
 {
 	phy_StoreTxPowerByRateBase(padapter);
drivers/staging/rtl8723bs/hal/odm.c +16 -16
index b4f872f4d6c9..4f9e5edecaa1 100644
@@ -279,22 +279,22 @@ static void odm_RefreshRateAdaptiveMaskCE(struct dm_odm_t *pDM_Odm)
 }
 
 /*-----------------------------------------------------------------------------
-* Function:	odm_RefreshRateAdaptiveMask()
-*
-* Overview:	Update rate table mask according to rssi
-*
-* Input:		NONE
-*
-* Output:		NONE
-*
-* Return:		NONE
-*
-* Revised History:
-*When		Who		Remark
-*05/27/2009	hpfan	Create Version 0.
-*
-* --------------------------------------------------------------------------
-*/
+ * Function:	odm_RefreshRateAdaptiveMask()
+ *
+ * Overview:	Update rate table mask according to rssi
+ *
+ * Input:		NONE
+ *
+ * Output:		NONE
+ *
+ * Return:		NONE
+ *
+ * Revised History:
+ *When		Who		Remark
+ *05/27/2009	hpfan	Create Version 0.
+ *
+ * --------------------------------------------------------------------------
+ */
 static void odm_RefreshRateAdaptiveMask(struct dm_odm_t *pDM_Odm)
 {
 
drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c +7 -7
index 6c9337179645..2485c415f14b 100644
@@ -32,13 +32,13 @@ static u8 _is_fw_read_cmd_down(struct adapter *padapter, u8 msgbox_num)
 
 
 /*****************************************
-* H2C Msg format :
-*| 31 - 8		|7-5	| 4 - 0	|
-*| h2c_msg	|Class	|CMD_ID	|
-*| 31-0						|
-*| Ext msg					|
-*
-******************************************/
+ * H2C Msg format :
+ *| 31 - 8		|7-5	| 4 - 0	|
+ *| h2c_msg	|Class	|CMD_ID	|
+ *| 31-0						|
+ *| Ext msg					|
+ *
+ ******************************************/
 s32 FillH2CCmd8723B(struct adapter *padapter, u8 ElementID, u32 CmdLen, u8 *pCmdBuffer)
 {
 	u8 h2c_box_num;
drivers/staging/rtl8723bs/hal/rtl8723b_rf6052.c +1 -1
index ffb35e1ace62..e56536dbbd96 100644
@@ -24,7 +24,7 @@
  * 11/05/2008	MHC		Add API for tw power setting.
  *
  *
-******************************************************************************/
+ ******************************************************************************/
 
 #include <rtl8723b_hal.h>
 
Signature · 1 line
2.34.1
#2 lore raw

PATCH 2/2 staging: rtl8723bs: move block comment terminator to new line

In reply to Jennifer Guo

Move block comment terminator '*/' to separate line in order to adhere to the kernel coding style.

This fixes the following checkpatch.pl warning:
WARNING: Block comments use a trailing */ on a separate line

---
 drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c  | 3 ++-
 drivers/staging/rtl8723bs/hal/rtl8723b_rf6052.c | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)
drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c +2 -1
index 6ab65e9e8bee..005b0b724bdd 100644
@@ -148,7 +148,8 @@ static void setCCKFilterCoefficient(struct dm_odm_t *pDM_Odm, u8 CCKSwingIndex)
  *When		Who	Remark
  *04/23/2012	MHC	Create Version 0.
  *
- *---------------------------------------------------------------------------*/
+ *---------------------------------------------------------------------------
+ */
 void ODM_TxPwrTrackSetPwr_8723B(
 	struct dm_odm_t *pDM_Odm,
 	enum pwrtrack_method Method,
drivers/staging/rtl8723bs/hal/rtl8723b_rf6052.c +2 -1
index e56536dbbd96..ad0b2d36312e 100644
@@ -53,7 +53,8 @@
  * Return:      NONE
  *
  * Note:		For RF type 0222D
- *---------------------------------------------------------------------------*/
+ *---------------------------------------------------------------------------
+ */
 void PHY_RF6052SetBandwidth8723B(
 	struct adapter *Adapter, enum channel_width Bandwidth
 ) /* 20M or 40M */
Signature · 1 line
2.34.1