staging: rtl8723bs: remove unnecessary braces
PATCH 1/1 staging: rtl8723bs: remove unnecessary braces
Remove redundant curly braces from single-statement blocks in rtl8723b_hal_init.c to adhere to the Linux kernel coding style. This resolves warnings reported by checkpatch.pl.
Signed-off-by Arsenii Pashchenko <[email protected]>
--- .../staging/rtl8723bs/hal/rtl8723b_hal_init.c | 51 +++++++++---------- 1 file changed, 25 insertions(+), 26 deletions(-)
drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +25 -26
@@ -194,9 +194,9 @@ static s32 polling_fwdl_chksum(yield (); }while (jiffies_to_msecs (jiffies-start) < timeout_ms || cnt < min_cnt); -if (!(value32 & FWDL_ChkSum_rpt)) { +if (!(value32 & FWDL_ChkSum_rpt)) goto exit; - } +if (g_fwdl_chksum_fail) { g_fwdl_chksum_fail--;
@@ -235,9 +235,9 @@ static s32 _FWFreeToGo(struct adapter *adapter, u32 min_cnt, u32 timeout_ms)yield (); }while (jiffies_to_msecs (jiffies - start) < timeout_ms || cnt < min_cnt); -if (!(value32 &WINTINI_RDY )) { +if (!(value32 &WINTINI_RDY )) goto exit; - } +if (g_fwdl_wintint_rdy_fail) { g_fwdl_wintint_rdy_fail--;
@@ -1031,9 +1031,9 @@ void UpdateHalRAMask8723B(struct adapter *padapter, u32 mac_id, u8 rssi_level) rate_bitmap =hal_btcoex_GetRaMask (padapter); mask &= ~rate_bitmap; -if (pHalData->fw_ractrl) { +if (pHalData->fw_ractrl)rtl8723b_set_FwMacIdConfig_cmd (padapter, mac_id, psta->raid, psta->bw_mode, short_gi_rate, mask); - } +/* set correct initial date rate for each mac_id */ pdmpriv->INIDATA_RATE[mac_id] = psta->init_rate;
@@ -1184,9 +1184,9 @@ void Hal_EfuseParseIDCode(struct adapter *padapter, u8 *hwinfo)/* Check 0x8129 again for making sure autoload status!! */ EEPROMId =le16_to_cpu (*((__le16 *)hwinfo)); -if (EEPROMId !=RTL_EEPROM_ID ) { +if (EEPROMId !=RTL_EEPROM_ID ) pEEPROM->bautoload_fail_flag = true; - }else +else pEEPROM->bautoload_fail_flag = false; }
@@ -1566,13 +1566,13 @@ u8 SCMapping_8723B(struct adapter *Adapter, struct pkt_attrib *pattrib)if (pattrib->bwmode ==CHANNEL_WIDTH_40 ) { SCSettingOfDesc =HT_DATA_SC_DONOT_CARE ; }else if (pattrib->bwmode ==CHANNEL_WIDTH_20 ) { -if (pHalData->nCur40MhzPrimeSC ==HAL_PRIME_CHNL_OFFSET_UPPER ) { +if (pHalData->nCur40MhzPrimeSC ==HAL_PRIME_CHNL_OFFSET_UPPER ) SCSettingOfDesc =HT_DATA_SC_20_UPPER_OF_40MHZ ; - }else if (pHalData->nCur40MhzPrimeSC ==HAL_PRIME_CHNL_OFFSET_LOWER ) { +else if (pHalData->nCur40MhzPrimeSC ==HAL_PRIME_CHNL_OFFSET_LOWER ) SCSettingOfDesc =HT_DATA_SC_20_LOWER_OF_40MHZ ; - }else { +else SCSettingOfDesc =HT_DATA_SC_DONOT_CARE ; - } + } }else { SCSettingOfDesc =HT_DATA_SC_DONOT_CARE ;
@@ -1596,9 +1596,9 @@ static void rtl8723b_cal_txdesc_chksum(struct tx_desc *ptxdesc)/* Thomas, Lucas@SD4, 20130515 */ count =16 ; -for (index =0 ; index < count; index++) { +for (index =0 ; index < count; index++) checksum |=le16_to_cpu (*(__le16 *)(usPtr + index)); - } + ptxdesc->txdw7 |=cpu_to_le32 (checksum &0x0000ffff ); }
@@ -1772,11 +1772,10 @@ static void rtl8723b_fill_default_txdesc( ptxdesc->mbssid = pattrib->mbssid &0xF ; ptxdesc->rty_lmt_en =1 ;/* retry limit enable */ -if (pattrib->retry_ctrl) { +if (pattrib->retry_ctrl) ptxdesc->data_rt_lmt =6 ; - }else { +else ptxdesc->data_rt_lmt =12 ; - } ptxdesc->datarate =MRateToHwRate (pmlmeext->tx_rate);
@@ -1867,9 +1866,9 @@ void rtl8723b_fill_fake_txdesc(SET_TX_DESC_HWSEQ_SEL_8723B (pDesc,0 ); } -if (IsBTQosNull) { +if (IsBTQosNull)SET_TX_DESC_BT_INT_8723B (pDesc,1 ); - } +SET_TX_DESC_USE_RATE_8723B (pDesc,1 );/* use data rate which is set by Sw */ SET_TX_DESC_OWN_8723B ((u8 *)pDesc,1 );
@@ -2184,9 +2183,9 @@ void CCX_FwC2HTxRpt_8723b(struct adapter *padapter, u8 *pdata, u8 len)#define GET_8723B_C2H_TX_RPT_LIFE_TIME_OVER (_Header) LE_BITS_TO_1BYTE((_Header + 0), 6, 1)#define GET_8723B_C2H_TX_RPT_RETRY_OVER (_Header) LE_BITS_TO_1BYTE((_Header + 0), 7, 1) -if (GET_8723B_C2H_TX_RPT_RETRY_OVER (pdata) |GET_8723B_C2H_TX_RPT_LIFE_TIME_OVER (pdata)) { +if (GET_8723B_C2H_TX_RPT_RETRY_OVER (pdata) |GET_8723B_C2H_TX_RPT_LIFE_TIME_OVER (pdata))rtw_ack_tx_done (&padapter->xmitpriv,RTW_SCTX_DONE_CCX_PKT_FAIL ); - } +/* else if (seq_no != padapter->xmitpriv.seq_no) { rtw_ack_tx_done(&padapter->xmitpriv, RTW_SCTX_DONE_CCX_PKT_FAIL);
@@ -2555,9 +2554,9 @@ void SetHwReg8723B(struct adapter *padapter, u8 variable, u8 *val)/* Forece leave RF low power mode for 1T1R to prevent conficting setting in Fw power */ /* saving sequence. 2010.06.07. Added by tynli. Suggested by SD3 yschang. */ -if (psmode !=PS_MODE_ACTIVE ) { +if (psmode !=PS_MODE_ACTIVE )ODM_RF_Saving (&pHalData->odmpriv, true); - } +/* if (psmode != PS_MODE_ACTIVE) { */ /* rtl8723b_set_lowpwr_lps_cmd(padapter, true); */
@@ -2871,11 +2870,11 @@ u8 GetHalDefVar8723B(struct adapter *padapter, enum hal_def_variable variable, vbreak ;case HAL_DEF_TX_PAGE_BOUNDARY : -if (!padapter->registrypriv.wifi_spec) { +if (!padapter->registrypriv.wifi_spec) *(u8 *)pval =TX_PAGE_BOUNDARY_8723B ; - }else { +else *(u8 *)pval =WMM_NORMAL_TX_PAGE_BOUNDARY_8723B ; - } +break ;case HAL_DEF_MACID_SLEEP :
Signature · 1 line
2.55.0