staging: rtl8192u: Align descendant arguments
PATCH v2 1/1 staging: rtl8192u: Align descendant arguments
Adhere to Linux kernel coding style.
"...A very commonly used style is to align descendants to a function open parenthesis" - (Excerpted from Linux kernel coding style (#2))
Reported by checkpatch:
CHECK: Alignment should match open parenthesis
---
v2: In the first patch I changed my commit title in the email and sent it before amending it in my git tree which then changed its SHA ID. I felt it might cause an issue so that is why I did a v2 of the patch.
drivers/staging/rtl8192u/r8180_93cx6.c | 4 ++-- drivers/staging/rtl8192u/r8190_rtl8256.c | 16 +++++++-------- drivers/staging/rtl8192u/r8192U_core.c | 20 +++++++++--------- drivers/staging/rtl8192u/r8192U_dm.c | 24 +++++++++++----------- drivers/staging/rtl8192u/r819xU_firmware.c | 4 ++-- drivers/staging/rtl8192u/r819xU_phy.c | 2 +- 6 files changed, 35 insertions(+), 35 deletions(-)
drivers/staging/rtl8192u/r8180_93cx6.c +2 -2
@@ -114,7 +114,7 @@ int eprom_read(struct net_device *dev, u32 addr) ret =0 ;/* enable EPROM programming */ write_nic_byte_E (dev,EPROM_CMD , - (EPROM_CMD_PROGRAM <<EPROM_CMD_OPERATING_MODE_SHIFT )); + (EPROM_CMD_PROGRAM <<EPROM_CMD_OPERATING_MODE_SHIFT ));force_pci_posting (dev);udelay (EPROM_DELAY );
@@ -165,6 +165,6 @@ int eprom_read(struct net_device *dev, u32 addr)/* disable EPROM programming */ write_nic_byte_E (dev,EPROM_CMD , - (EPROM_CMD_NORMAL <<EPROM_CMD_OPERATING_MODE_SHIFT )); + (EPROM_CMD_NORMAL <<EPROM_CMD_OPERATING_MODE_SHIFT ));return ret; }
drivers/staging/rtl8192u/r8190_rtl8256.c +8 -8
@@ -46,17 +46,17 @@ void phy_set_rf8256_bandwidth(struct net_device *dev, enum ht_channel_width Band priv->card_8192_version == VERSION_819XU_B) {/* 8256 D-cut, E-cut, xiong: consider it later! */ rtl8192_phy_SetRFReg (dev, - (enum rf90_radio_path_e )eRFPath, -0x0b , bMask12Bits,0x100 );/* phy para:1ba */ + (enum rf90_radio_path_e )eRFPath, +0x0b , bMask12Bits,0x100 );/* phy para:1ba */ rtl8192_phy_SetRFReg (dev, - (enum rf90_radio_path_e )eRFPath, -0x2c , bMask12Bits,0x3d7 ); + (enum rf90_radio_path_e )eRFPath, +0x2c , bMask12Bits,0x3d7 );rtl8192_phy_SetRFReg (dev, - (enum rf90_radio_path_e )eRFPath, -0x0e , bMask12Bits,0x021 ); + (enum rf90_radio_path_e )eRFPath, +0x0e , bMask12Bits,0x021 );rtl8192_phy_SetRFReg (dev, - (enum rf90_radio_path_e )eRFPath, -0x14 , bMask12Bits,0x5ab ); + (enum rf90_radio_path_e )eRFPath, +0x14 , bMask12Bits,0x5ab ); } else {RT_TRACE (COMP_ERR ,"%s(): unknown hardware version\n" , __func__); }
drivers/staging/rtl8192u/r8192U_core.c +10 -10
@@ -2236,7 +2236,7 @@ static int rtl8192_read_eeprom_info(struct net_device *dev) *((u16 *)(&priv->EEPROMTxPowerLevelCCK_V1[1 ])) = tmpValue;if (bLoad_From_EEPOM) tmpValue =eprom_read (dev, -EEPROM_TX_PW_INDEX_OFDM_24G_V1 >>1 ); +EEPROM_TX_PW_INDEX_OFDM_24G_V1 >>1 );else tmpValue =0x1010 ; *((u16 *)(&priv->EEPROMTxPowerLevelOFDM24G[0 ])) = tmpValue;
@@ -2536,16 +2536,16 @@ static bool rtl8192_adapter_start(struct net_device *dev)/* Initialize Number of Reserved Pages in Firmware Queue */ write_nic_dword (dev,RQPN1 , -NUM_OF_PAGE_IN_FW_QUEUE_BK <<RSVD_FW_QUEUE_PAGE_BK_SHIFT | -NUM_OF_PAGE_IN_FW_QUEUE_BE <<RSVD_FW_QUEUE_PAGE_BE_SHIFT | -NUM_OF_PAGE_IN_FW_QUEUE_VI <<RSVD_FW_QUEUE_PAGE_VI_SHIFT | -NUM_OF_PAGE_IN_FW_QUEUE_VO <<RSVD_FW_QUEUE_PAGE_VO_SHIFT ); +NUM_OF_PAGE_IN_FW_QUEUE_BK <<RSVD_FW_QUEUE_PAGE_BK_SHIFT | +NUM_OF_PAGE_IN_FW_QUEUE_BE <<RSVD_FW_QUEUE_PAGE_BE_SHIFT | +NUM_OF_PAGE_IN_FW_QUEUE_VI <<RSVD_FW_QUEUE_PAGE_VI_SHIFT | +NUM_OF_PAGE_IN_FW_QUEUE_VO <<RSVD_FW_QUEUE_PAGE_VO_SHIFT );write_nic_dword (dev,RQPN2 , -NUM_OF_PAGE_IN_FW_QUEUE_MGNT <<RSVD_FW_QUEUE_PAGE_MGNT_SHIFT | -NUM_OF_PAGE_IN_FW_QUEUE_CMD <<RSVD_FW_QUEUE_PAGE_CMD_SHIFT ); +NUM_OF_PAGE_IN_FW_QUEUE_MGNT <<RSVD_FW_QUEUE_PAGE_MGNT_SHIFT | +NUM_OF_PAGE_IN_FW_QUEUE_CMD <<RSVD_FW_QUEUE_PAGE_CMD_SHIFT );write_nic_dword (dev,RQPN3 , -APPLIED_RESERVED_QUEUE_IN_FW | -NUM_OF_PAGE_IN_FW_QUEUE_BCN <<RSVD_FW_QUEUE_PAGE_BCN_SHIFT ); +APPLIED_RESERVED_QUEUE_IN_FW | +NUM_OF_PAGE_IN_FW_QUEUE_BCN <<RSVD_FW_QUEUE_PAGE_BCN_SHIFT );write_nic_dword (dev,RATR0 +4 *7 , (RATE_ALL_OFDM_AG |RATE_ALL_CCK ));/* Set AckTimeout */
@@ -3019,7 +3019,7 @@ static void rtl819x_ifsilentreset(struct net_device *dev) }static void rtl819x_update_rxcounts (struct r8192_priv *priv,u32 *TotalRxBcnNum, -u32 *TotalRxDataNum) +u32 *TotalRxDataNum) {u16 SlotIndex;u16 i;
drivers/staging/rtl8192u/r8192U_dm.c +12 -12
@@ -331,7 +331,7 @@ static void dm_check_rate_adaptive(struct net_device *dev)if (pra->ping_rssi_enable) {if (priv->undecorated_smoothed_pwdb < (long )(pra->ping_rssi_thresh_for_ra+5 )) {if ((priv->undecorated_smoothed_pwdb < (long )pra->ping_rssi_thresh_for_ra) || - ping_rssi_state) { + ping_rssi_state) { pra->ratr_state =DM_RATR_STA_LOW ; targetRATR = pra->ping_rssi_ratr; ping_rssi_state =1 ;
@@ -612,7 +612,7 @@ static void dm_TXPowerTrackingCallback_ThermalMeter(struct net_device *dev)if (tmpRegA == OFDMSwingTable[i]) { priv->OFDM_index = (u8 )i;RT_TRACE (COMP_POWER_TRACKING ,"Initial reg0x%x = 0x%x, OFDM_index=0x%x\n" , - rOFDM0_XATxIQImbalance, tmpRegA, priv->OFDM_index); + rOFDM0_XATxIQImbalance, tmpRegA, priv->OFDM_index); } }
@@ -622,7 +622,7 @@ static void dm_TXPowerTrackingCallback_ThermalMeter(struct net_device *dev)if (TempCCk == (u32 )CCKSwingTable_Ch1_Ch13[i][0 ]) { priv->CCK_index = (u8 ) i;RT_TRACE (COMP_POWER_TRACKING ,"Initial reg0x%x = 0x%x, CCK_index=0x%x\n" , - rCCK0_TxFilter1, TempCCk, priv->CCK_index); + rCCK0_TxFilter1, TempCCk, priv->CCK_index);break ; } }
@@ -695,7 +695,7 @@ static void dm_TXPowerTrackingCallback_ThermalMeter(struct net_device *dev) priv->OFDM_index = tmpOFDMindex;rtl8192_setBBreg (dev, rOFDM0_XATxIQImbalance, bMaskDWord, OFDMSwingTable[priv->OFDM_index]);RT_TRACE (COMP_POWER_TRACKING ,"Update OFDMSwing[%d] = 0x%x\n" , - priv->OFDM_index, OFDMSwingTable[priv->OFDM_index]); + priv->OFDM_index, OFDMSwingTable[priv->OFDM_index]); } priv->txpower_count =0 ; }
@@ -1352,7 +1352,7 @@ static void dm_CCKTxPowerAdjust_ThermalMeter(struct net_device *dev, bool bInCH (CCKSwingTable_Ch1_Ch13[priv->CCK_index][1 ]<<8 );rtl8192_setBBreg (dev, rCCK0_TxFilter1, bMaskHWord, TempVal);RT_TRACE (COMP_POWER_TRACKING ,"CCK not chnl 14, reg 0x%x = 0x%x\n" , - rCCK0_TxFilter1, TempVal); + rCCK0_TxFilter1, TempVal);/* Write 0xa24 ~ 0xa27 */ TempVal = CCKSwingTable_Ch1_Ch13[priv->CCK_index][2 ] + (CCKSwingTable_Ch1_Ch13[priv->CCK_index][3]<<8) +
@@ -1360,14 +1360,14 @@ static void dm_CCKTxPowerAdjust_ThermalMeter(struct net_device *dev, bool bInCH (CCKSwingTable_Ch1_Ch13[priv->CCK_index][5 ]<<24 );rtl8192_setBBreg (dev, rCCK0_TxFilter2, bMaskDWord, TempVal);RT_TRACE (COMP_POWER_TRACKING ,"CCK not chnl 14, reg 0x%x = 0x%x\n" , - rCCK0_TxFilter2, TempVal); + rCCK0_TxFilter2, TempVal);/* Write 0xa28 0xa29 */ TempVal = CCKSwingTable_Ch1_Ch13[priv->CCK_index][6 ] + (CCKSwingTable_Ch1_Ch13[priv->CCK_index][7 ]<<8 );rtl8192_setBBreg (dev, rCCK0_DebugPort, bMaskLWord, TempVal);RT_TRACE (COMP_POWER_TRACKING ,"CCK not chnl 14, reg 0x%x = 0x%x\n" , - rCCK0_DebugPort, TempVal); + rCCK0_DebugPort, TempVal); }else {/* Write 0xa22 0xa23 */ TempVal = CCKSwingTable_Ch14[priv->CCK_index][0] +
@@ -1764,7 +1764,7 @@ static void dm_ctrl_initgain_byrssi_highpwr(/* For smooth, we can not change high power DIG state in the range. */ if ((priv->undecorated_smoothed_pwdb > dm_digtable.rssi_high_power_lowthresh) && - (priv->undecorated_smoothed_pwdb < dm_digtable.rssi_high_power_highthresh)) + (priv->undecorated_smoothed_pwdb < dm_digtable.rssi_high_power_highthresh))return ;/* 3. When RSSI >75% or <70%, it is a high power issue. We have to judge if
@@ -1790,7 +1790,7 @@ static void dm_ctrl_initgain_byrssi_highpwr( dm_digtable.dig_highpwr_state =DM_STA_DIG_OFF ;if (priv->undecorated_smoothed_pwdb < dm_digtable.rssi_high_power_lowthresh && - priv->undecorated_smoothed_pwdb >= dm_digtable.rssi_high_thresh) { + priv->undecorated_smoothed_pwdb >= dm_digtable.rssi_high_thresh) {/* 3.2 Recover PD_TH for OFDM for normal power region. */ if (priv->CurrentChannelBW !=HT_CHANNEL_WIDTH_20 ) {write_nic_byte (dev, (rOFDM0_XATxAFE+3 ),0x20 );
@@ -1881,7 +1881,7 @@ static void dm_pd_th(else if (dm_digtable.rssi_val <= dm_digtable.rssi_low_thresh) dm_digtable.curpd_thstate =DIG_PD_AT_LOW_POWER ;else if ((dm_digtable.rssi_val >= dm_digtable.rssi_high_thresh) && - (dm_digtable.rssi_val < dm_digtable.rssi_high_power_lowthresh)) + (dm_digtable.rssi_val < dm_digtable.rssi_high_power_lowthresh)) dm_digtable.curpd_thstate =DIG_PD_AT_NORMAL_POWER ;else dm_digtable.curpd_thstate = dm_digtable.prepd_thstate;
@@ -2620,7 +2620,7 @@ void dm_check_fsync(struct net_device *dev)RT_TRACE (COMP_HALDM ,"RateBitmap 0x%x FirstDiffRateThreshold %d SecondDiffRateThreshold %d\n" , priv->ieee80211->fsync_rate_bitmap, priv->ieee80211->fsync_firstdiff_ratethreshold, priv->ieee80211->fsync_seconddiff_ratethreshold);if (priv->ieee80211->state ==IEEE80211_LINKED && - (priv->ieee80211->pHTInfo->IOTAction &HT_IOT_ACT_CDD_FSYNC )) { + (priv->ieee80211->pHTInfo->IOTAction &HT_IOT_ACT_CDD_FSYNC )) {if (priv->ieee80211->bfsync_enable ==0 ) {switch (priv->ieee80211->fsync_state) {case Default_Fsync:
@@ -2779,7 +2779,7 @@ static void dm_dynamic_txpower(struct net_device *dev) }if ((priv->bDynamicTxHighPower != priv->bLastDTPFlag_High) || - (priv->bDynamicTxLowPower != priv->bLastDTPFlag_Low)) { + (priv->bDynamicTxLowPower != priv->bLastDTPFlag_Low)) {RT_TRACE (COMP_TXAGC ,"SetTxPowerLevel8190() channel = %d\n" , priv->ieee80211->current_network.channel);#if defined(RTL8190P ) || defined(RTL8192E )
drivers/staging/rtl8192u/r819xU_firmware.c +2 -2
@@ -88,8 +88,8 @@ static bool fw_download_code(struct net_device *dev, u8 *code_virtual_address, index = tcb_desc->queue_index;if (!priv->ieee80211->check_nic_enough_desc (dev, index) || - (!skb_queue_empty (&priv->ieee80211->skb_waitQ[index])) || - (priv->ieee80211->queue_stop)) { + (!skb_queue_empty (&priv->ieee80211->skb_waitQ[index])) || + (priv->ieee80211->queue_stop)) {RT_TRACE (COMP_FIRMWARE ,"=====================================================> tx full!\n" );skb_queue_tail (&priv->ieee80211->skb_waitQ[tcb_desc->queue_index], skb); }else {
drivers/staging/rtl8192u/r819xU_phy.c +1 -1
@@ -875,7 +875,7 @@ void rtl8192_phy_getTxPower(struct net_device *dev)read_nic_byte (dev, rOFDM0_RxDetector2, &tmp); priv->framesyncC34 = tmp;RT_TRACE (COMP_INIT ,"Default framesync (0x%x) = 0x%x\n" , - rOFDM0_RxDetector3, priv->framesync); + rOFDM0_RxDetector3, priv->framesync);/* Read SIFS (save the value read fome MACPHY_REG.txt) */ read_nic_word (dev,SIFS , &priv->SifsTime);
Signature · 1 line
2.34.1
Hi Gilbert,
Quoted 10 lines · Gilbert Adikankwu
Adhere to Linux kernel coding style.
"...A very commonly used style is to align descendants to a function open parenthesis" - (Excerpted from Linux kernel coding style (#2))
Reported by checkpatch:
CHECK: Alignment should match open parenthesis
Signed-off-by Gilbert Adikankwu <[email protected]>
I don't like this commit message. Although it's correctly written, I think it can be improved in order to be more immediately understandable.
Write what you did in imperative form:
"Adhere to Linux kernel coding style" doesn't mean much, you can write
Align descendant argument to the open parenthesis as per the "Linux kernel coding style" in Documentation/process/coding-style.rst.
Yuo tell immediately what you did and where to find the reference. Citing the document in the commit log, in this case, looks to me like an unnecessary information.
Copy pasting the output of the error is a very good practice and you can write it as:
Mute the following checkpatch error:
CHECK: Alignment should match open parenthesis
Quoted 5 lines
---
v2: In the first patch I changed my commit title in the email and sent it before amending it in my git tree which then changed its SHA ID. I felt it might cause an issue so that is why I did a v2 of the patch.
It's not an issue, you can do that.
But I'm going to give you another piece of advice that I already gave in this list. Do not send patches between versions too fast. Reviewers need some time to review... wait some time before sending the v2, so that the v1 gets enough visibility. Sometimes reviewers correct each other, but they need time to read the e-mails.
This way you would also avoid unnecessary noise.
Andi
Hi Andi,
Quoted 31 lines · Andi Shyti
Hi Gilbert,
Quoted 10 lines · Gilbert Adikankwu
Adhere to Linux kernel coding style.
"...A very commonly used style is to align descendants to a function open parenthesis" - (Excerpted from Linux kernel coding style (#2))
Reported by checkpatch:
CHECK: Alignment should match open parenthesis
Signed-off-by Gilbert Adikankwu <[email protected]>I don't like this commit message. Although it's correctly written, I think it can be improved in order to be more immediately understandable.
Write what you did in imperative form:
"Adhere to Linux kernel coding style" doesn't mean much, you can write
Align descendant argument to the open parenthesis as per the "Linux kernel coding style" in
Documentation/process/coding-style.rst.Yuo tell immediately what you did and where to find the reference. Citing the document in the commit log, in this case, looks to me like an unnecessary information.
Quoted 7 lines
Copy pasting the output of the error is a very good practice and you can write it as:
Mute the following checkpatch error:
CHECK: Alignment should match open parenthesis
Thank you for the review. I will adopt the corrections and try to be more concise in the commit message for my future patches.
Quoted 15 lines
Quoted 5 lines
---
v2: In the first patch I changed my commit title in the email and sent it before amending it in my git tree which then changed its SHA ID. I felt it might cause an issue so that is why I did a v2 of the patch.It's not an issue, you can do that.
But I'm going to give you another piece of advice that I already gave in this list. Do not send patches between versions too fast. Reviewers need some time to review... wait some time before sending the v2, so that the v1 gets enough visibility. Sometimes reviewers correct each other, but they need time to read the e-mails.
Quoted 3 lines
This way you would also avoid unnecessary noise.
Andi
Okay, thank you for the advice.
Gilbert
Quoted 31 lines · Andi Shyti
Hi Gilbert,
Quoted 10 lines · Gilbert Adikankwu
Adhere to Linux kernel coding style.
"...A very commonly used style is to align descendants to a function open parenthesis" - (Excerpted from Linux kernel coding style (#2))
Reported by checkpatch:
CHECK: Alignment should match open parenthesis
Signed-off-by Gilbert Adikankwu <[email protected]>I don't like this commit message. Although it's correctly written, I think it can be improved in order to be more immediately understandable.
Write what you did in imperative form:
"Adhere to Linux kernel coding style" doesn't mean much, you can write
Align descendant argument to the open parenthesis as per the "Linux kernel coding style" in
Documentation/process/coding-style.rst.Yuo tell immediately what you did and where to find the reference. Citing the document in the commit log, in this case, looks to me like an unnecessary information.
Quoted 6 lines
Copy pasting the output of the error is a very good practice and you can write it as:
Mute the following checkpatch error:
CHECK: Alignment should match open parenthesis
In this case, it seems fine, but some of the checkpatch messages are a bit verbose, and anyway the specific fix is a bit different than the checkpatch message, so you can use your judgement about this.
julia
Quoted 21 lines
Quoted 6 lines
---
v2: In the first patch I changed my commit title in the email and sent it before amending it in my git tree which then changed its SHA ID. I felt it might cause an issue so that is why I did a v2 of the patch.It's not an issue, you can do that.
But I'm going to give you another piece of advice that I already gave in this list. Do not send patches between versions too fast. Reviewers need some time to review... wait some time before sending the v2, so that the v1 gets enough visibility. Sometimes reviewers correct each other, but they need time to read the e-mails.
This way you would also avoid unnecessary noise.
Andi