diff options
Diffstat (limited to 'drivers/staging/rtl8723bs/hal/hal_com_phycfg.c')
| -rw-r--r-- | drivers/staging/rtl8723bs/hal/hal_com_phycfg.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c b/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c index 12c1cd590056..336764464e7d 100644 --- a/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c +++ b/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c @@ -1723,7 +1723,7 @@ s8 phy_get_tx_pwr_lmt(struct adapter *adapter, u32 reg_pwr_tbl_sel, idx_rate_sctn = get_rate_sctn_idx(data_rate); if (band_type == BAND_ON_5G && idx_rate_sctn == 0) - DBG_871X("Wrong rate 0x%x: No CCK in 5G Band\n", DataRate); + DBG_871X("Wrong rate 0x%x: No CCK in 5G Band\n", DataRate); /* workaround for wrong index combination to obtain tx power limit, */ /* OFDM only exists in BW 20M */ @@ -1749,6 +1749,7 @@ s8 phy_get_tx_pwr_lmt(struct adapter *adapter, u32 reg_pwr_tbl_sel, if (band_type == BAND_ON_2_4G) { s8 limits[10] = {0}; u8 i = 0; + for (i = 0; i < MAX_REGULATION_NUM; i++) limits[i] = hal_data->TxPwrLimit_2_4G[i] [idx_bandwidth] @@ -1766,6 +1767,7 @@ s8 phy_get_tx_pwr_lmt(struct adapter *adapter, u32 reg_pwr_tbl_sel, } else if (band_type == BAND_ON_5G) { s8 limits[10] = {0}; u8 i = 0; + for (i = 0; i < MAX_REGULATION_NUM; ++i) limits[i] = hal_data->TxPwrLimit_5G[i] [idx_bandwidth] @@ -2236,7 +2238,7 @@ int phy_ConfigMACWithParaFile(struct adapter *Adapter, char *pFileName) memset(pHalData->para_file_buf, 0, MAX_PARA_FILE_BUF_LEN); - if ((pHalData->mac_reg_len == 0) && (pHalData->mac_reg == NULL)) { + if ((pHalData->mac_reg_len == 0) && !pHalData->mac_reg) { rtw_merge_string(file_path_bs, PATH_MAX, rtw_phy_file_path, pFileName); if (rtw_is_file_readable(file_path_bs) == true) { @@ -2311,7 +2313,7 @@ int phy_ConfigBBWithParaFile( memset(pHalData->para_file_buf, 0, MAX_PARA_FILE_BUF_LEN); - if ((pBufLen != NULL) && (*pBufLen == 0) && (pBuf == NULL)) { + if (pBufLen && (*pBufLen == 0) && !pBuf) { rtw_merge_string(file_path_bs, PATH_MAX, rtw_phy_file_path, pFileName); if (rtw_is_file_readable(file_path_bs) == true) { @@ -2336,7 +2338,7 @@ int phy_ConfigBBWithParaFile( } } } else { - if ((pBufLen != NULL) && (*pBufLen == 0) && (pBuf == NULL)) { + if (pBufLen && (*pBufLen == 0) && !pBuf) { memcpy(pHalData->para_file_buf, pBuf, *pBufLen); rtStatus = _SUCCESS; } else @@ -2680,7 +2682,7 @@ int phy_ConfigBBWithPgParaFile(struct adapter *Adapter, char *pFileName) memset(pHalData->para_file_buf, 0, MAX_PARA_FILE_BUF_LEN); - if ((pHalData->bb_phy_reg_pg_len == 0) && (pHalData->bb_phy_reg_pg == NULL)) { + if ((pHalData->bb_phy_reg_pg_len == 0) && !pHalData->bb_phy_reg_pg) { rtw_merge_string(file_path_bs, PATH_MAX, rtw_phy_file_path, pFileName); if (rtw_is_file_readable(file_path_bs) == true) { @@ -2743,7 +2745,7 @@ int PHY_ConfigRFWithParaFile( memset(pHalData->para_file_buf, 0, MAX_PARA_FILE_BUF_LEN); - if ((pBufLen != NULL) && (*pBufLen == 0) && (pBuf == NULL)) { + if (pBufLen && (*pBufLen == 0) && !pBuf) { rtw_merge_string(file_path_bs, PATH_MAX, rtw_phy_file_path, pFileName); if (rtw_is_file_readable(file_path_bs) == true) { @@ -2768,7 +2770,7 @@ int PHY_ConfigRFWithParaFile( } } } else { - if ((pBufLen != NULL) && (*pBufLen == 0) && (pBuf == NULL)) { + if (pBufLen && (*pBufLen == 0) && !pBuf) { memcpy(pHalData->para_file_buf, pBuf, *pBufLen); rtStatus = _SUCCESS; } else @@ -2925,7 +2927,7 @@ int PHY_ConfigRFWithTxPwrTrackParaFile(struct adapter *Adapter, char *pFileName) memset(pHalData->para_file_buf, 0, MAX_PARA_FILE_BUF_LEN); - if ((pHalData->rf_tx_pwr_track_len == 0) && (pHalData->rf_tx_pwr_track == NULL)) { + if ((pHalData->rf_tx_pwr_track_len == 0) && !pHalData->rf_tx_pwr_track) { rtw_merge_string(file_path_bs, PATH_MAX, rtw_phy_file_path, pFileName); if (rtw_is_file_readable(file_path_bs) == true) { @@ -3238,7 +3240,7 @@ int PHY_ConfigRFWithPowerLimitTableParaFile( memset(pHalData->para_file_buf, 0, MAX_PARA_FILE_BUF_LEN); - if ((pHalData->rf_tx_pwr_lmt_len == 0) && (pHalData->rf_tx_pwr_lmt == NULL)) { + if ((pHalData->rf_tx_pwr_lmt_len == 0) && !pHalData->rf_tx_pwr_lmt) { rtw_merge_string(file_path_bs, PATH_MAX, rtw_phy_file_path, pFileName); if (rtw_is_file_readable(file_path_bs) == true) { |