staging: rtl8188eu: add spaces around '+' in usb_halinit.c
PATCH 1/6 staging: rtl8188eu: add spaces around '+' in usb_halinit.c
Add spaces around '+' to improve readability and follow kernel coding style. Reported by checkpatch.
--- drivers/staging/rtl8188eu/hal/usb_halinit.c | 76 ++++++++++----------- 1 file changed, 38 insertions(+), 38 deletions(-)
drivers/staging/rtl8188eu/hal/usb_halinit.c +38 -38
@@ -183,7 +183,7 @@ static void _InitTxBufferBoundary(struct adapter *Adapter, u8 txpktbuf_bndy)usb_write8 (Adapter,REG_TXPKTBUF_MGQ_BDNY , txpktbuf_bndy);usb_write8 (Adapter,REG_TXPKTBUF_WMAC_LBK_BF_HD , txpktbuf_bndy);usb_write8 (Adapter,REG_TRXFF_BNDY , txpktbuf_bndy); -usb_write8 (Adapter,REG_TDECTRL +1 , txpktbuf_bndy); +usb_write8 (Adapter,REG_TDECTRL +1 , txpktbuf_bndy); }static void _InitPageBoundary (struct adapter *Adapter)
@@ -504,7 +504,7 @@ static void usb_AggSettingRxUpdate(struct adapter *Adapter)switch (haldata->UsbRxAggMode) {case USB_RX_AGG_DMA :usb_write8 (Adapter,REG_RXDMA_AGG_PG_TH , haldata->UsbRxAggPageCount); -usb_write8 (Adapter,REG_RXDMA_AGG_PG_TH +1 , haldata->UsbRxAggPageTimeout); +usb_write8 (Adapter,REG_RXDMA_AGG_PG_TH +1 , haldata->UsbRxAggPageTimeout);break ;case USB_RX_AGG_USB :usb_write8 (Adapter,REG_USB_AGG_TH , haldata->UsbRxAggBlockCount);
@@ -512,7 +512,7 @@ static void usb_AggSettingRxUpdate(struct adapter *Adapter)break ;case USB_RX_AGG_MIX :usb_write8 (Adapter,REG_RXDMA_AGG_PG_TH , haldata->UsbRxAggPageCount); -usb_write8 (Adapter,REG_RXDMA_AGG_PG_TH +1 , (haldata->UsbRxAggPageTimeout &0x1F ));/* 0x280[12:8] */ +usb_write8 (Adapter,REG_RXDMA_AGG_PG_TH +1 , (haldata->UsbRxAggPageTimeout &0x1F ));/* 0x280[12:8] */ usb_write8 (Adapter,REG_USB_AGG_TH , haldata->UsbRxAggBlockCount);usb_write8 (Adapter,REG_USB_AGG_TO , haldata->UsbRxAggBlockTimeout);break ;
@@ -569,9 +569,9 @@ static void _InitBeaconParameters(struct adapter *Adapter) haldata->RegBcnCtrlVal =usb_read8 (Adapter,REG_BCN_CTRL ); haldata->RegTxPause =usb_read8 (Adapter,REG_TXPAUSE ); - haldata->RegFwHwTxQCtrl =usb_read8 (Adapter,REG_FWHW_TXQ_CTRL +2 ); - haldata->RegReg542 =usb_read8 (Adapter,REG_TBTT_PROHIBIT +2 ); - haldata->RegCR_1 =usb_read8 (Adapter,REG_CR +1 ); + haldata->RegFwHwTxQCtrl =usb_read8 (Adapter,REG_FWHW_TXQ_CTRL +2 ); + haldata->RegReg542 =usb_read8 (Adapter,REG_TBTT_PROHIBIT +2 ); + haldata->RegCR_1 =usb_read8 (Adapter,REG_CR +1 ); } static void _BeaconFunctionEnable(struct adapter *Adapter,
@@ -579,7 +579,7 @@ static void _BeaconFunctionEnable(struct adapter *Adapter, {usb_write8 (Adapter,REG_BCN_CTRL , (BIT (4 ) |BIT (3 ) |BIT (1 ))); -usb_write8 (Adapter,REG_RD_CTRL +1 ,0x6F ); +usb_write8 (Adapter,REG_RD_CTRL +1 ,0x6F ); }/* Set CCK and OFDM Block "ON" */
@@ -770,7 +770,7 @@ u32 rtl8188eu_hal_init(struct adapter *Adapter) value8 =usb_read8 (Adapter,REG_TX_RPT_CTRL );usb_write8 (Adapter,REG_TX_RPT_CTRL , (value8 |BIT (1 ) |BIT (0 )));/* Set MAX RPT MACID */ -usb_write8 (Adapter,REG_TX_RPT_CTRL +1 ,2 );/* FOR sta mode ,0: bc/mc ,1:AP */ +usb_write8 (Adapter,REG_TX_RPT_CTRL +1 ,2 );/* FOR sta mode ,0: bc/mc ,1:AP */ /* Tx RPT Timer. Unit: 32us */ usb_write16 (Adapter,REG_TX_RPT_TIME ,0xCdf0 );
@@ -827,10 +827,10 @@ u32 rtl8188eu_hal_init(struct adapter *Adapter) pwrctrlpriv->rf_pwrstate = rf_on;/* enable Tx report. */ -usb_write8 (Adapter,REG_FWHW_TXQ_CTRL +1 ,0x0F ); +usb_write8 (Adapter,REG_FWHW_TXQ_CTRL +1 ,0x0F );/* Suggested by SD1 pisa. Added by tynli. 2011.10.21. */ -usb_write8 (Adapter,REG_EARLY_MODE_CONTROL +3 ,0x01 );/* Pretx_en, for WEP/TKIP SEC */ +usb_write8 (Adapter,REG_EARLY_MODE_CONTROL +3 ,0x01 );/* Pretx_en, for WEP/TKIP SEC */ /* tynli_test_tx_report. */ usb_write16 (Adapter,REG_TX_RPT_TIME ,0x3DF0 );
@@ -894,9 +894,9 @@ static void CardDisableRTL8188EU(struct adapter *Adapter) val8 =usb_read8 (Adapter,REG_MCUFWDL );if ((val8 &RAM_DL_SEL ) && Adapter->bFWReady) {/* 8051 RAM code */ /* Reset MCU 0x2[10]=0. */ - val8 =usb_read8 (Adapter,REG_SYS_FUNC_EN +1 ); + val8 =usb_read8 (Adapter,REG_SYS_FUNC_EN +1 ); val8 &= ~BIT (2 );/* 0x2[10], FEN_CPUEN */ -usb_write8 (Adapter,REG_SYS_FUNC_EN +1 , val8); +usb_write8 (Adapter,REG_SYS_FUNC_EN +1 , val8); }/* reset MCU ready status */
@@ -912,10 +912,10 @@ static void CardDisableRTL8188EU(struct adapter *Adapter) Rtl8188E_NIC_DISABLE_FLOW);/* Reset MCU IO Wrapper */ - val8 =usb_read8 (Adapter,REG_RSV_CTRL +1 ); -usb_write8 (Adapter,REG_RSV_CTRL +1 , (val8&(~BIT (3 )))); - val8 =usb_read8 (Adapter,REG_RSV_CTRL +1 ); -usb_write8 (Adapter,REG_RSV_CTRL +1 , val8 |BIT (3 )); + val8 =usb_read8 (Adapter,REG_RSV_CTRL +1 ); +usb_write8 (Adapter,REG_RSV_CTRL +1 , (val8&(~BIT (3 )))); + val8 =usb_read8 (Adapter,REG_RSV_CTRL +1 ); +usb_write8 (Adapter,REG_RSV_CTRL +1 , val8 |BIT (3 ));/* YJ,test add, 111207. For Power Consumption. */ val8 =usb_read8 (Adapter,GPIO_IN );
@@ -924,8 +924,8 @@ static void CardDisableRTL8188EU(struct adapter *Adapter) val8 =usb_read8 (Adapter,REG_GPIO_IO_SEL );usb_write8 (Adapter,REG_GPIO_IO_SEL , (val8<<4 )); - val8 =usb_read8 (Adapter,REG_GPIO_IO_SEL +1 ); -usb_write8 (Adapter,REG_GPIO_IO_SEL +1 , val8|0x0F );/* Reg0x43 */ + val8 =usb_read8 (Adapter,REG_GPIO_IO_SEL +1 ); +usb_write8 (Adapter,REG_GPIO_IO_SEL +1 , val8|0x0F );/* Reg0x43 */ usb_write32 (Adapter,REG_BB_PAD_CTRL ,0x00080808 );/* set LNA ,TRSW,EX_PA Pin to output mode */ Adapter->HalData->bMacPwrCtrlOn = false; Adapter->bFWReady = false;
@@ -1103,11 +1103,11 @@ static void ResumeTxBeacon(struct adapter *adapt)/* 2010.03.01. Marked by tynli. No need to call workitem beacause we record the value */ /* which should be read from register to a global variable. */ -usb_write8 (adapt,REG_FWHW_TXQ_CTRL +2 , (haldata->RegFwHwTxQCtrl) |BIT (6 )); +usb_write8 (adapt,REG_FWHW_TXQ_CTRL +2 , (haldata->RegFwHwTxQCtrl) |BIT (6 )); haldata->RegFwHwTxQCtrl |=BIT (6 ); -usb_write8 (adapt,REG_TBTT_PROHIBIT +1 ,0xff ); +usb_write8 (adapt,REG_TBTT_PROHIBIT +1 ,0xff ); haldata->RegReg542 |=BIT (0 ); -usb_write8 (adapt,REG_TBTT_PROHIBIT +2 , haldata->RegReg542); +usb_write8 (adapt,REG_TBTT_PROHIBIT +2 , haldata->RegReg542); }static void StopTxBeacon (struct adapter *adapt)
@@ -1117,11 +1117,11 @@ static void StopTxBeacon(struct adapter *adapt)/* 2010.03.01. Marked by tynli. No need to call workitem beacause we record the value */ /* which should be read from register to a global variable. */ -usb_write8 (adapt,REG_FWHW_TXQ_CTRL +2 , (haldata->RegFwHwTxQCtrl) & (~BIT (6 ))); +usb_write8 (adapt,REG_FWHW_TXQ_CTRL +2 , (haldata->RegFwHwTxQCtrl) & (~BIT (6 ))); haldata->RegFwHwTxQCtrl &= (~BIT (6 )); -usb_write8 (adapt,REG_TBTT_PROHIBIT +1 ,0x64 ); +usb_write8 (adapt,REG_TBTT_PROHIBIT +1 ,0x64 ); haldata->RegReg542 &= ~(BIT (0 )); -usb_write8 (adapt,REG_TBTT_PROHIBIT +2 , haldata->RegReg542); +usb_write8 (adapt,REG_TBTT_PROHIBIT +2 , haldata->RegReg542);/* todo: CheckFwRsvdPageContent(Adapter); 2010.06.23. Added by tynli. */ }
@@ -1191,7 +1191,7 @@ static void hw_var_set_macaddr(struct adapter *Adapter, u8 variable, u8 *val) reg_macid =REG_MACID ;for (idx =0 ; idx <6 ; idx++) -usb_write8 (Adapter, (reg_macid+idx), val[idx]); +usb_write8 (Adapter, (reg_macid + idx), val[idx]); }static void hw_var_set_bssid (struct adapter *Adapter,u8 variable,u8 *val)
@@ -1202,7 +1202,7 @@ static void hw_var_set_bssid(struct adapter *Adapter, u8 variable, u8 *val) reg_bssid =REG_BSSID ;for (idx =0 ; idx <6 ; idx++) -usb_write8 (Adapter, (reg_bssid+idx), val[idx]); +usb_write8 (Adapter, (reg_bssid + idx), val[idx]); }static void hw_var_set_bcn_func (struct adapter *Adapter,u8 variable,u8 *val)
@@ -1274,8 +1274,8 @@ void rtw_hal_set_hwreg(struct adapter *Adapter, u8 variable, u8 *val) BrateCfg |=0x01 ;/* default enable 1M ACK rate */ /* Set RRSR rate table. */ usb_write8 (Adapter,REG_RRSR , BrateCfg &0xff ); -usb_write8 (Adapter,REG_RRSR +1 , (BrateCfg >>8 ) &0xff ); -usb_write8 (Adapter,REG_RRSR +2 ,usb_read8 (Adapter,REG_RRSR +2 )&0xf0 ); +usb_write8 (Adapter,REG_RRSR +1 , (BrateCfg >>8 ) &0xff ); +usb_write8 (Adapter,REG_RRSR +2 ,usb_read8 (Adapter,REG_RRSR +2 )&0xf0 );/* Set RTS initial rate */ while (BrateCfg >0x1 ) {
@@ -1307,7 +1307,7 @@ void rtw_hal_set_hwreg(struct adapter *Adapter, u8 variable, u8 *val)usb_write8 (Adapter,REG_BCN_CTRL ,usb_read8 (Adapter,REG_BCN_CTRL )&(~BIT (3 )));usb_write32 (Adapter,REG_TSFTR , tsf); -usb_write32 (Adapter,REG_TSFTR +4 , tsf>>32 ); +usb_write32 (Adapter,REG_TSFTR +4 , tsf>>32 );/* enable related TSF function */ usb_write8 (Adapter,REG_BCN_CTRL ,usb_read8 (Adapter,REG_BCN_CTRL ) |BIT (3 ));
@@ -1432,10 +1432,10 @@ void rtw_hal_set_hwreg(struct adapter *Adapter, u8 variable, u8 *val)case HW_VAR_RESP_SIFS :/* RESP_SIFS for CCK */ usb_write8 (Adapter,REG_R2T_SIFS , val[0 ]);/* SIFS_T2T_CCK (0x08) */ -usb_write8 (Adapter,REG_R2T_SIFS +1 , val[1 ]);/* SIFS_R2T_CCK(0x08) */ +usb_write8 (Adapter,REG_R2T_SIFS +1 , val[1 ]);/* SIFS_R2T_CCK(0x08) */ /* RESP_SIFS for OFDM */ usb_write8 (Adapter,REG_T2T_SIFS , val[2 ]);/* SIFS_T2T_OFDM (0x0a) */ -usb_write8 (Adapter,REG_T2T_SIFS +1 , val[3 ]);/* SIFS_R2T_OFDM(0x0a) */ +usb_write8 (Adapter,REG_T2T_SIFS +1 , val[3 ]);/* SIFS_R2T_OFDM(0x0a) */ break ;case HW_VAR_ACK_PREAMBLE : {
@@ -1446,7 +1446,7 @@ void rtw_hal_set_hwreg(struct adapter *Adapter, u8 variable, u8 *val)if (bShortPreamble) regTmp |=0x80 ; -usb_write8 (Adapter,REG_RRSR +2 , regTmp); +usb_write8 (Adapter,REG_RRSR +2 , regTmp); }break ;case HW_VAR_SEC_CFG :
@@ -1484,7 +1484,7 @@ void rtw_hal_set_hwreg(struct adapter *Adapter, u8 variable, u8 *val)else ulContent =0 ;/* polling bit, and No Write enable, and address */ - ulCommand =CAM_CONTENT_COUNT *ucIndex+i; + ulCommand =CAM_CONTENT_COUNT *ucIndex + i; ulCommand = ulCommand |CAM_POLLINIG |CAM_WRITE ;/* write content 0 is equall to mark invalid */ usb_write32 (Adapter,WCAMI , ulContent);/* delay_ms(40); */
@@ -1595,7 +1595,7 @@ void rtw_hal_set_hwreg(struct adapter *Adapter, u8 variable, u8 *val)if ((pRegToSet[index] &0x0f ) > FactorToSet) pRegToSet[index] = (pRegToSet[index] &0xf0 ) | (FactorToSet); -usb_write8 (Adapter, (REG_AGGLEN_LMT +index), pRegToSet[index]); +usb_write8 (Adapter, (REG_AGGLEN_LMT + index), pRegToSet[index]); } } }
@@ -1706,8 +1706,8 @@ void rtw_hal_set_hwreg(struct adapter *Adapter, u8 variable, u8 *val) {u8 maxMacid = *val; -DBG_88E ("### MacID(%d),Set Max Tx RPT MID(%d)\n" , maxMacid, maxMacid+1 ); -usb_write8 (Adapter,REG_TX_RPT_CTRL +1 , maxMacid+1 ); +DBG_88E ("### MacID(%d),Set Max Tx RPT MID(%d)\n" , maxMacid, maxMacid +1 ); +usb_write8 (Adapter,REG_TX_RPT_CTRL +1 , maxMacid +1 ); }break ;case HW_VAR_H2C_MEDIA_STATUS_RPT :
@@ -1715,7 +1715,7 @@ void rtw_hal_set_hwreg(struct adapter *Adapter, u8 variable, u8 *val)break ;case HW_VAR_BCN_VALID :/* BCN_VALID, BIT16 of REG_TDECTRL = BIT0 of REG_TDECTRL+2, write 1 to clear, Clear by sw */ -usb_write8 (Adapter,REG_TDECTRL +2 ,usb_read8 (Adapter,REG_TDECTRL +2 ) |BIT (0 )); +usb_write8 (Adapter,REG_TDECTRL +2 ,usb_read8 (Adapter,REG_TDECTRL +2 ) |BIT (0 ));break ;default :break ;
@@ -1733,7 +1733,7 @@ void rtw_hal_get_hwreg(struct adapter *Adapter, u8 variable, u8 *val)break ;case HW_VAR_BCN_VALID :/* BCN_VALID, BIT16 of REG_TDECTRL = BIT0 of REG_TDECTRL+2 */ - val[0 ] = (BIT (0 ) &usb_read8 (Adapter,REG_TDECTRL +2 )) ? true : false; + val[0 ] = (BIT (0 ) &usb_read8 (Adapter,REG_TDECTRL +2 )) ? true : false;break ;case HW_VAR_FWLPS_RF_ON : {
Signature · 1 line
2.22.0
PATCH 4/6 staging: rtl8188eu: add spaces around '<<' and '>>' in usb_halinit.c
Add spaces around '<<' and '>>' to improve readability and follow kernel coding style. Reported by checkpatch.
--- drivers/staging/rtl8188eu/hal/usb_halinit.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/staging/rtl8188eu/hal/usb_halinit.c +6 -6
@@ -923,7 +923,7 @@ static void CardDisableRTL8188EU(struct adapter *Adapter)usb_write8 (Adapter,GPIO_IO_SEL ,0xFF );/* Reg0x46 */ val8 =usb_read8 (Adapter,REG_GPIO_IO_SEL ); -usb_write8 (Adapter,REG_GPIO_IO_SEL , (val8<<4 )); +usb_write8 (Adapter,REG_GPIO_IO_SEL , (val8 <<4 )); val8 =usb_read8 (Adapter,REG_GPIO_IO_SEL +1 );usb_write8 (Adapter,REG_GPIO_IO_SEL +1 , val8 |0x0F );/* Reg0x43 */ usb_write32 (Adapter,REG_BB_PAD_CTRL ,0x00080808 );/* set LNA ,TRSW,EX_PA Pin to output mode */
@@ -1307,7 +1307,7 @@ void rtw_hal_set_hwreg(struct adapter *Adapter, u8 variable, u8 *val)usb_write8 (Adapter,REG_BCN_CTRL ,usb_read8 (Adapter,REG_BCN_CTRL ) & (~BIT (3 )));usb_write32 (Adapter,REG_TSFTR , tsf); -usb_write32 (Adapter,REG_TSFTR +4 , tsf>>32 ); +usb_write32 (Adapter,REG_TSFTR +4 , tsf >>32 );/* enable related TSF function */ usb_write8 (Adapter,REG_BCN_CTRL ,usb_read8 (Adapter,REG_BCN_CTRL ) |BIT (3 ));
@@ -1442,7 +1442,7 @@ void rtw_hal_set_hwreg(struct adapter *Adapter, u8 variable, u8 *val)u8 regTmp;u8 bShortPreamble = *((bool *)val);/* Joseph marked out for Netgear 3500 TKIP channel 7 issue.(Temporarily) */ - regTmp = (haldata->nCur40MhzPrimeSC)<<5 ; + regTmp = (haldata->nCur40MhzPrimeSC) <<5 ;if (bShortPreamble) regTmp |=0x80 ;
@@ -1480,7 +1480,7 @@ void rtw_hal_set_hwreg(struct adapter *Adapter, u8 variable, u8 *val)for (i =0 ; i <CAM_CONTENT_COUNT ; i++) {/* filled id in CAM config 2 byte */ if (i ==0 ) - ulContent |= (ucIndex &0x03 ) | ((u16)(ulEncAlgo)<<2 ); + ulContent |= (ucIndex &0x03 ) | ((u16)(ulEncAlgo) <<2 );else ulContent =0 ;/* polling bit, and No Write enable, and address */
@@ -1590,8 +1590,8 @@ void rtw_hal_set_hwreg(struct adapter *Adapter, u8 variable, u8 *val) FactorToSet =0xf ;for (index =0 ; index <4 ; index++) { -if ((pRegToSet[index] &0xf0 ) > (FactorToSet<<4 )) - pRegToSet[index] = (pRegToSet[index] &0x0f ) | (FactorToSet<<4 ); +if ((pRegToSet[index] &0xf0 ) > (FactorToSet <<4 )) + pRegToSet[index] = (pRegToSet[index] &0x0f ) | (FactorToSet <<4 );if ((pRegToSet[index] &0x0f ) > FactorToSet) pRegToSet[index] = (pRegToSet[index] &0xf0 ) | (FactorToSet);
Signature · 1 line
2.22.0
PATCH 3/6 staging: rtl8188eu: add spaces around '|' in usb_halinit.c
In reply to Michael StraubeAdd spaces around '|' to improve readability and follow kernel coding style. Reported by checkpatch.
--- drivers/staging/rtl8188eu/hal/usb_halinit.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-)
drivers/staging/rtl8188eu/hal/usb_halinit.c +9 -8
@@ -925,7 +925,7 @@ static void CardDisableRTL8188EU(struct adapter *Adapter) val8 =usb_read8 (Adapter,REG_GPIO_IO_SEL );usb_write8 (Adapter,REG_GPIO_IO_SEL , (val8<<4 )); val8 =usb_read8 (Adapter,REG_GPIO_IO_SEL +1 ); -usb_write8 (Adapter,REG_GPIO_IO_SEL +1 , val8|0x0F );/* Reg0x43 */ +usb_write8 (Adapter,REG_GPIO_IO_SEL +1 , val8 |0x0F );/* Reg0x43 */ usb_write32 (Adapter,REG_BB_PAD_CTRL ,0x00080808 );/* set LNA ,TRSW,EX_PA Pin to output mode */ Adapter->HalData->bMacPwrCtrlOn = false; Adapter->bFWReady = false;
@@ -1176,7 +1176,7 @@ static void hw_var_set_opmode(struct adapter *Adapter, u8 variable, u8 *val)/* enable BCN0 Function for if1 */ /* don't enable update TSF0 for if1 (due to TSF update when beacon/probe rsp are received) */ -usb_write8 (Adapter,REG_BCN_CTRL , (DIS_TSF_UDT0_NORMAL_CHIP |EN_BCN_FUNCTION |BIT (1 ))); +usb_write8 (Adapter,REG_BCN_CTRL , (DIS_TSF_UDT0_NORMAL_CHIP |EN_BCN_FUNCTION |BIT (1 )));/* dis BCN1 ATIM WND if if2 is station */ usb_write8 (Adapter,REG_BCN_CTRL_1 ,usb_read8 (Adapter,REG_BCN_CTRL_1 ) |BIT (0 ));
@@ -1318,7 +1318,7 @@ void rtw_hal_set_hwreg(struct adapter *Adapter, u8 variable, u8 *val)break ;case HW_VAR_CHECK_BSSID :if (*((u8 *)val)) { -usb_write32 (Adapter,REG_RCR ,usb_read32 (Adapter,REG_RCR )|RCR_CBSSID_DATA |RCR_CBSSID_BCN ); +usb_write32 (Adapter,REG_RCR ,usb_read32 (Adapter,REG_RCR ) |RCR_CBSSID_DATA |RCR_CBSSID_BCN ); }else {u32 val32;
@@ -1369,7 +1369,7 @@ void rtw_hal_set_hwreg(struct adapter *Adapter, u8 variable, u8 *val)usb_write8 (Adapter,REG_BCN_CTRL ,usb_read8 (Adapter,REG_BCN_CTRL ) & (~BIT (4 ))); } -usb_write32 (Adapter,REG_RCR ,usb_read32 (Adapter,REG_RCR )|RCR_CBSSID_BCN ); +usb_write32 (Adapter,REG_RCR ,usb_read32 (Adapter,REG_RCR ) |RCR_CBSSID_BCN ); }break ;case HW_VAR_MLME_JOIN :
@@ -1382,7 +1382,7 @@ void rtw_hal_set_hwreg(struct adapter *Adapter, u8 variable, u8 *val)/* enable to rx data frame.Accept all data frame */ usb_write16 (Adapter,REG_RXFLTMAP2 ,0xFFFF ); -usb_write32 (Adapter,REG_RCR ,usb_read32 (Adapter,REG_RCR )|RCR_CBSSID_DATA |RCR_CBSSID_BCN ); +usb_write32 (Adapter,REG_RCR ,usb_read32 (Adapter,REG_RCR ) |RCR_CBSSID_DATA |RCR_CBSSID_BCN );if (check_fwstate (pmlmepriv,WIFI_STATION_STATE )) RetryLimit = (haldata->CustomerID ==RT_CID_CCX ) ?7 :48 ;
@@ -1396,7 +1396,7 @@ void rtw_hal_set_hwreg(struct adapter *Adapter, u8 variable, u8 *val)/* enable update TSF */ usb_write8 (Adapter,REG_BCN_CTRL ,usb_read8 (Adapter,REG_BCN_CTRL ) & (~BIT (4 ))); -if (check_fwstate (pmlmepriv,WIFI_ADHOC_STATE |WIFI_ADHOC_MASTER_STATE )) +if (check_fwstate (pmlmepriv,WIFI_ADHOC_STATE |WIFI_ADHOC_MASTER_STATE )) RetryLimit =0x7 ; }usb_write16 (Adapter,REG_RL , RetryLimit <<RETRY_LIMIT_SHORT_SHIFT | RetryLimit <<RETRY_LIMIT_LONG_SHIFT );
@@ -1485,7 +1485,8 @@ void rtw_hal_set_hwreg(struct adapter *Adapter, u8 variable, u8 *val) ulContent =0 ;/* polling bit, and No Write enable, and address */ ulCommand =CAM_CONTENT_COUNT *ucIndex + i; - ulCommand = ulCommand |CAM_POLLINIG |CAM_WRITE ; + ulCommand = ulCommand |CAM_POLLINIG | +CAM_WRITE ;/* write content 0 is equall to mark invalid */ usb_write32 (Adapter,WCAMI , ulContent);/* delay_ms(40); */ usb_write32 (Adapter,RWCAM , ulCommand);/* delay_ms(40); */
@@ -1681,7 +1682,7 @@ void rtw_hal_set_hwreg(struct adapter *Adapter, u8 variable, u8 *val)if (!pwrpriv->bkeepfwalive) {/* RX DMA stop */ -usb_write32 (Adapter,REG_RXPKT_NUM , (usb_read32 (Adapter,REG_RXPKT_NUM )|RW_RELEASE_EN )); +usb_write32 (Adapter,REG_RXPKT_NUM , (usb_read32 (Adapter,REG_RXPKT_NUM ) |RW_RELEASE_EN )); do { if (!(usb_read32(Adapter, REG_RXPKT_NUM) & RXDMA_IDLE)) break;
Signature · 1 line
2.22.0
PATCH 6/6 staging: rtl8188eu: cleanup comparsion to NULL in usb_halinit.c
In reply to Michael StraubeUse if(!x) instead of if(x == NULL).
Reported by checkpatch.
--- drivers/staging/rtl8188eu/hal/usb_halinit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/rtl8188eu/hal/usb_halinit.c +1 -1
@@ -1889,7 +1889,7 @@ void UpdateHalRAMask8188EUsb(struct adapter *adapt, u32 mac_id, u8 rssi_level)if (mac_id >=NUM_STA )/* CAM_SIZE */ return ; psta = pmlmeinfo->FW_sta_info[mac_id].psta; -if (psta ==NULL ) +if (!psta)return ;switch (mac_id) {case 0 :/* for infra mode */
Signature · 1 line
2.22.0
PATCH 5/6 staging: rtl8188eu: add spaces around '-' and '*' in usb_halinit.c
In reply to Michael StraubeAdd spaces around '-' and '*' to improve readability and follow kernel coding style. Reported by checkpatch.
--- drivers/staging/rtl8188eu/hal/usb_halinit.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/staging/rtl8188eu/hal/usb_halinit.c +3 -3
@@ -190,7 +190,7 @@ static void _InitPageBoundary(struct adapter *Adapter) {/* RX Page Boundary */ /* */ -u16 rxff_bndy =MAX_RX_DMA_BUFFER_SIZE_88E -1 ; +u16 rxff_bndy =MAX_RX_DMA_BUFFER_SIZE_88E -1 ;usb_write16 (Adapter, (REG_TRXFF_BNDY +2 ), rxff_bndy); }
@@ -1298,7 +1298,7 @@ void rtw_hal_set_hwreg(struct adapter *Adapter, u8 variable, u8 *val)struct mlme_ext_priv *pmlmeext = &Adapter->mlmeextpriv;struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info; - tsf = pmlmeext->TSFValue -do_div (pmlmeext->TSFValue, (pmlmeinfo->bcn_interval*1024 )) -1024 ;/* us */ + tsf = pmlmeext->TSFValue -do_div (pmlmeext->TSFValue, (pmlmeinfo->bcn_interval *1024 )) -1024 ;/* us */ if (((pmlmeinfo->state &0x03 ) ==WIFI_FW_ADHOC_STATE ) || ((pmlmeinfo->state &0x03 ) ==WIFI_FW_AP_STATE ))StopTxBeacon (Adapter);
@@ -1484,7 +1484,7 @@ void rtw_hal_set_hwreg(struct adapter *Adapter, u8 variable, u8 *val)else ulContent =0 ;/* polling bit, and No Write enable, and address */ - ulCommand =CAM_CONTENT_COUNT *ucIndex + i; + ulCommand =CAM_CONTENT_COUNT * ucIndex + i; ulCommand = ulCommand |CAM_POLLINIG |CAM_WRITE ;/* write content 0 is equall to mark invalid */
Signature · 1 line
2.22.0
PATCH 2/6 staging: rtl8188eu: add spaces around '&' in usb_halinit.c
In reply to Michael StraubeAdd spaces around '&' to improve readability and follow kernel coding style. Reported by checkpatch.
--- drivers/staging/rtl8188eu/hal/usb_halinit.c | 38 ++++++++++----------- 1 file changed, 19 insertions(+), 19 deletions(-)
drivers/staging/rtl8188eu/hal/usb_halinit.c +19 -19
@@ -633,7 +633,7 @@ enum rt_rf_power_state RfOnOffDetect(struct adapter *adapt)DBG_88E ("pwrdown, 0x5c(BIT(7))=%02x\n" , val8); rfpowerstate = (val8 &BIT (7 )) ? rf_off : rf_on; }else {/* rf on/off */ -usb_write8 (adapt,REG_MAC_PINMUX_CFG ,usb_read8 (adapt,REG_MAC_PINMUX_CFG )&~(BIT (3 ))); +usb_write8 (adapt,REG_MAC_PINMUX_CFG ,usb_read8 (adapt,REG_MAC_PINMUX_CFG ) & ~(BIT (3 ))); val8 =usb_read8 (adapt,REG_GPIO_IO_SEL );DBG_88E ("GPIO_IN=%02x\n" , val8); rfpowerstate = (val8 &BIT (3 )) ? rf_on : rf_off;
@@ -880,7 +880,7 @@ static void CardDisableRTL8188EU(struct adapter *Adapter)/* Stop Tx Report Timer. 0x4EC[Bit1]=b'0 */ val8 =usb_read8 (Adapter,REG_TX_RPT_CTRL ); -usb_write8 (Adapter,REG_TX_RPT_CTRL , val8&(~BIT (1 ))); +usb_write8 (Adapter,REG_TX_RPT_CTRL , val8 & (~BIT (1 )));/* stop rx */ usb_write8 (Adapter,REG_CR ,0x0 );
@@ -905,7 +905,7 @@ static void CardDisableRTL8188EU(struct adapter *Adapter)/* YJ,add,111212 */ /* Disable 32k */ val8 =usb_read8 (Adapter,REG_32K_CTRL ); -usb_write8 (Adapter,REG_32K_CTRL , val8&(~BIT (0 ))); +usb_write8 (Adapter,REG_32K_CTRL , val8 & (~BIT (0 )));/* Card disable power action flow */ rtl88eu_pwrseqcmdparsing(Adapter, PWR_CUT_ALL_MSK,
@@ -913,7 +913,7 @@ static void CardDisableRTL8188EU(struct adapter *Adapter)/* Reset MCU IO Wrapper */ val8 =usb_read8 (Adapter,REG_RSV_CTRL +1 ); -usb_write8 (Adapter,REG_RSV_CTRL +1 , (val8&(~BIT (3 )))); +usb_write8 (Adapter,REG_RSV_CTRL +1 , (val8 & (~BIT (3 )))); val8 =usb_read8 (Adapter,REG_RSV_CTRL +1 );usb_write8 (Adapter,REG_RSV_CTRL +1 , val8 |BIT (3 ));
@@ -1135,7 +1135,7 @@ static void hw_var_set_opmode(struct adapter *Adapter, u8 variable, u8 *val)usb_write8 (Adapter,REG_BCN_CTRL ,usb_read8 (Adapter,REG_BCN_CTRL ) |BIT (4 ));/* set net_type */ - val8 =usb_read8 (Adapter,MSR )&0x0c ; + val8 =usb_read8 (Adapter,MSR ) &0x0c ; val8 |= mode;usb_write8 (Adapter,MSR , val8);
@@ -1214,7 +1214,7 @@ static void hw_var_set_bcn_func(struct adapter *Adapter, u8 variable, u8 *val)if (*((u8 *)val))usb_write8 (Adapter, bcn_ctrl_reg, (EN_BCN_FUNCTION |EN_TXBCN_RPT ));else -usb_write8 (Adapter, bcn_ctrl_reg,usb_read8 (Adapter, bcn_ctrl_reg)&(~(EN_BCN_FUNCTION |EN_TXBCN_RPT ))); +usb_write8 (Adapter, bcn_ctrl_reg,usb_read8 (Adapter, bcn_ctrl_reg) & (~(EN_BCN_FUNCTION |EN_TXBCN_RPT ))); }void rtw_hal_set_hwreg (struct adapter *Adapter,u8 variable,u8 *val)
@@ -1228,7 +1228,7 @@ void rtw_hal_set_hwreg(struct adapter *Adapter, u8 variable, u8 *val) {u8 val8; - val8 =usb_read8 (Adapter,MSR )&0x0c ; + val8 =usb_read8 (Adapter,MSR ) &0x0c ; val8 |= *((u8 *)val);usb_write8 (Adapter,MSR , val8); }
@@ -1275,7 +1275,7 @@ void rtw_hal_set_hwreg(struct adapter *Adapter, u8 variable, u8 *val)/* Set RRSR rate table. */ usb_write8 (Adapter,REG_RRSR , BrateCfg &0xff );usb_write8 (Adapter,REG_RRSR +1 , (BrateCfg >>8 ) &0xff ); -usb_write8 (Adapter,REG_RRSR +2 ,usb_read8 (Adapter,REG_RRSR +2 )&0xf0 ); +usb_write8 (Adapter,REG_RRSR +2 ,usb_read8 (Adapter,REG_RRSR +2 ) &0xf0 );/* Set RTS initial rate */ while (BrateCfg >0x1 ) {
@@ -1300,11 +1300,11 @@ void rtw_hal_set_hwreg(struct adapter *Adapter, u8 variable, u8 *val) tsf = pmlmeext->TSFValue -do_div (pmlmeext->TSFValue, (pmlmeinfo->bcn_interval*1024 )) -1024 ;/* us */ -if (((pmlmeinfo->state&0x03 ) ==WIFI_FW_ADHOC_STATE ) || ((pmlmeinfo->state&0x03 ) ==WIFI_FW_AP_STATE )) +if (((pmlmeinfo->state &0x03 ) ==WIFI_FW_ADHOC_STATE ) || ((pmlmeinfo->state &0x03 ) ==WIFI_FW_AP_STATE ))StopTxBeacon (Adapter);/* disable related TSF function */ -usb_write8 (Adapter,REG_BCN_CTRL ,usb_read8 (Adapter,REG_BCN_CTRL )&(~BIT (3 ))); +usb_write8 (Adapter,REG_BCN_CTRL ,usb_read8 (Adapter,REG_BCN_CTRL ) & (~BIT (3 )));usb_write32 (Adapter,REG_TSFTR , tsf);usb_write32 (Adapter,REG_TSFTR +4 , tsf>>32 );
@@ -1312,7 +1312,7 @@ void rtw_hal_set_hwreg(struct adapter *Adapter, u8 variable, u8 *val)/* enable related TSF function */ usb_write8 (Adapter,REG_BCN_CTRL ,usb_read8 (Adapter,REG_BCN_CTRL ) |BIT (3 )); -if (((pmlmeinfo->state&0x03 ) ==WIFI_FW_ADHOC_STATE ) || ((pmlmeinfo->state&0x03 ) ==WIFI_FW_AP_STATE )) +if (((pmlmeinfo->state &0x03 ) ==WIFI_FW_ADHOC_STATE ) || ((pmlmeinfo->state &0x03 ) ==WIFI_FW_AP_STATE ))ResumeTxBeacon (Adapter); }break ;
@@ -1357,16 +1357,16 @@ void rtw_hal_set_hwreg(struct adapter *Adapter, u8 variable, u8 *val)struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;if ((is_client_associated_to_ap (Adapter)) || - ((pmlmeinfo->state&0x03 ) ==WIFI_FW_ADHOC_STATE )) { + ((pmlmeinfo->state &0x03 ) ==WIFI_FW_ADHOC_STATE )) {/* enable to rx data frame */ usb_write16 (Adapter,REG_RXFLTMAP2 ,0xFFFF );/* enable update TSF */ -usb_write8 (Adapter,REG_BCN_CTRL ,usb_read8 (Adapter,REG_BCN_CTRL )&(~BIT (4 ))); - }else if ((pmlmeinfo->state&0x03 ) ==WIFI_FW_AP_STATE ) { +usb_write8 (Adapter,REG_BCN_CTRL ,usb_read8 (Adapter,REG_BCN_CTRL ) & (~BIT (4 ))); + }else if ((pmlmeinfo->state &0x03 ) ==WIFI_FW_AP_STATE ) {usb_write16 (Adapter,REG_RXFLTMAP2 ,0xFFFF );/* enable update TSF */ -usb_write8 (Adapter,REG_BCN_CTRL ,usb_read8 (Adapter,REG_BCN_CTRL )&(~BIT (4 ))); +usb_write8 (Adapter,REG_BCN_CTRL ,usb_read8 (Adapter,REG_BCN_CTRL ) & (~BIT (4 ))); }usb_write32 (Adapter,REG_RCR ,usb_read32 (Adapter,REG_RCR )|RCR_CBSSID_BCN );
@@ -1394,7 +1394,7 @@ void rtw_hal_set_hwreg(struct adapter *Adapter, u8 variable, u8 *val) }else if (type ==2 ) {/* sta add event call back */ /* enable update TSF */ -usb_write8 (Adapter,REG_BCN_CTRL ,usb_read8 (Adapter,REG_BCN_CTRL )&(~BIT (4 ))); +usb_write8 (Adapter,REG_BCN_CTRL ,usb_read8 (Adapter,REG_BCN_CTRL ) & (~BIT (4 )));if (check_fwstate (pmlmepriv,WIFI_ADHOC_STATE |WIFI_ADHOC_MASTER_STATE )) RetryLimit =0x7 ;
@@ -1683,7 +1683,7 @@ void rtw_hal_set_hwreg(struct adapter *Adapter, u8 variable, u8 *val)/* RX DMA stop */ usb_write32 (Adapter,REG_RXPKT_NUM , (usb_read32 (Adapter,REG_RXPKT_NUM )|RW_RELEASE_EN ));do { -if (!(usb_read32 (Adapter,REG_RXPKT_NUM )&RXDMA_IDLE )) +if (!(usb_read32 (Adapter,REG_RXPKT_NUM ) &RXDMA_IDLE ))break ; }while (trycnt--);if (trycnt ==0 )
@@ -1764,7 +1764,7 @@ void rtw_hal_get_hwreg(struct adapter *Adapter, u8 variable, u8 *val) *val = Adapter->HalData->bMacPwrCtrlOn;break ;case HW_VAR_CHK_HI_QUEUE_EMPTY : - *val = ((usb_read32 (Adapter,REG_HGQ_INFORMATION )&0x0000ff00 ) ==0 ) ? true : false; + *val = ((usb_read32 (Adapter,REG_HGQ_INFORMATION ) &0x0000ff00 ) ==0 ) ? true : false;break ;default :break ;
@@ -1925,7 +1925,7 @@ void UpdateHalRAMask8188EUsb(struct adapter *adapt, u32 mac_id, u8 rssi_level) mask &= rate_bitmap; - init_rate =get_highest_rate_idx (mask)&0x3f ; + init_rate =get_highest_rate_idx (mask) &0x3f ;ODM_RA_UpdateRateInfo_8188E (odmpriv, mac_id, raid, mask, shortGIrate);
Signature · 1 line
2.22.0
Quoted 7 lines · Michael Straube
Add spaces around '+' to improve readability and follow kernel coding style. Reported by checkpatch.
Signed-off-by Michael Straube <[email protected]>--- drivers/staging/rtl8188eu/hal/usb_halinit.c | 76 ++++++++++----------- 1 file changed, 38 insertions(+), 38 deletions(-)
If they apply, all six of these are OK.
Larry
Quoted 2 lines · Michael Straube
Add spaces around '+' to improve readability and follow kernel coding style. Reported by checkpatch.
My preference would be to do all the horizontal whitespace changes for the entire driver in one go without worrying about long lines.
$ git ls-files -- 'drivers/staging/rtl8188eu/*.[ch]' | \ xargs ./scripts/checkpatch.pl -f --types=SPACING --fix-inplace $ git diff -w drivers/staging/rtl8188eu/ $ git diff --shortstat drivers/staging/rtl8188eu 35 files changed, 603 insertions(+), 603 deletions(-)
Mention that git diff -w shows no difference and verify that object files are unchanged and mention both in the changelog.
Subject could be something like:
staging: rtl8188eu: Use typical kernel horizontal whitespace