staging: rtl8723bs: hal: Remove and modify NULL comparisons
v2 cover staging: rtl8723bs: hal: Remove and modify NULL comparisons
- This patchset removes comparision to NULL in various files of drivers/staging/rtl8723bs/hal/ .
- The changes are broken into separate patches to keep the length of each patch below/near 100 lines for convinient reviewing.
v2:
- Change subject lines of patches
- Include a new patch to modify comparision with a constant
Himadri Pandya (4):
staging: rtl8723bs: hal: Remove comparisions to NULL
staging: rtl8723bs: hal: Remove NULL comparisions
staging: rtl8723bs: hal: Replace variable==NULL comparisions with
!variable
staging: rtl8723bs: hal: Modify comparision to keep constant at right
drivers/staging/rtl8723bs/hal/hal_btcoex.c | 8 ++++---- drivers/staging/rtl8723bs/hal/hal_com.c | 8 ++++---- drivers/staging/rtl8723bs/hal/hal_com_phycfg.c | 18 +++++++++--------- drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c | 8 ++++---- drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c | 6 +++--- 5 files changed, 24 insertions(+), 24 deletions(-)
Signature · 1 line
2.17.1
PATCH v2 1/4 staging: rtl8723bs: hal: Remove comparisions to NULL
Remove comparision to NULL. Suggested by Coccinelle.
---
Changes in V2:
- Change subject line
--- drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c | 8 ++++---- drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-)
drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c +4 -4
@@ -1480,7 +1480,7 @@ static void rtl8723b_set_FwRsvdPagePkt( MaxRsvdPageBufSize = RsvdPageNum*PageSize; pcmdframe =rtw_alloc_cmdxmitframe (pxmitpriv); -if (pcmdframe ==NULL ) { +if (!pcmdframe) {DBG_871X ("%s: alloc ReservedPagePacket fail!\n" , __func__);return ; }
@@ -2069,7 +2069,7 @@ void rtl8723b_Add_RateATid(u32 mask = bitmap&0x0FFFFFFF ; psta = pmlmeinfo->FW_sta_info[mac_id].psta; -if (psta ==NULL ) +if (!psta)return ; bw = psta->bw_mode;
@@ -2107,7 +2107,7 @@ static void ConstructBtNullFunctionData( pmlmeext = &padapter->mlmeextpriv; pmlmeinfo = &pmlmeext->mlmext_info; -if (NULL == StaAddr) { +if (!StaAddr) {memcpy (bssid,myid (&padapter->eeprompriv),ETH_ALEN ); StaAddr = bssid; }
@@ -2176,7 +2176,7 @@ static void SetFwRsvdPagePkt_BTCoex(struct adapter *padapter) MaxRsvdPageBufSize = RsvdPageNum*PageSize; pcmdframe =rtw_alloc_cmdxmitframe (pxmitpriv); -if (pcmdframe ==NULL ) { +if (!pcmdframe) {DBG_8192C ("%s: alloc ReservedPagePacket fail!\n" , __func__);return ; }
drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c +3 -3
@@ -63,7 +63,7 @@ static s32 rtl8723_dequeue_writeport(struct adapter *padapter)else pxmitbuf =dequeue_pending_xmitbuf (pxmitpriv); -if (pxmitbuf ==NULL ) +if (!pxmitbuf)return true; deviceId =ffaddr2deviceId (pdvobjpriv, pxmitbuf->ff_hwaddr);
@@ -284,7 +284,7 @@ static s32 xmit_xmitframes(struct adapter *padapter, struct xmit_priv *pxmitpriv/* check xmit_buf size enough or not */ txlen = txdesc_size +rtw_wlan_pkt_size (pxmitframe);if ( - (NULL == pxmitbuf) || + (!pxmitbuf) || ((_RND (pxmitbuf->len,8 ) + txlen) > max_xmit_len) || (k >= (rtw_hal_sdio_max_txoqt_free_space (padapter)-1 )) ) {
@@ -307,7 +307,7 @@ static s32 xmit_xmitframes(struct adapter *padapter, struct xmit_priv *pxmitpriv } pxmitbuf =rtw_alloc_xmitbuf (pxmitpriv); -if (pxmitbuf ==NULL ) { +if (!pxmitbuf) {#ifdef DBG_XMIT_BUF DBG_871X_LEVEL (_drv_err_,"%s: xmit_buf is not enough!\n" , __func__);#endif
Signature · 1 line
2.17.1
PATCH v2 2/4 staging: rtl8723bs: hal: Remove NULL comparisions
In reply to Himadri PandyaRemove comparision to NULL. Suggested by Coccinelle.
---
Changes in V2:
- Change subject line
--- drivers/staging/rtl8723bs/hal/hal_com_phycfg.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
drivers/staging/rtl8723bs/hal/hal_com_phycfg.c +9 -9
@@ -2236,7 +2236,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 +2311,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 +2336,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 +2680,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) {
@@ -2696,7 +2696,7 @@ int phy_ConfigBBWithPgParaFile(struct adapter *Adapter, char *pFileName) } } }else { -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) {memcpy (pHalData->para_file_buf, pHalData->bb_phy_reg_pg, pHalData->bb_phy_reg_pg_len); rtStatus = _SUCCESS; }else
@@ -2743,7 +2743,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 +2768,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 +2925,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 +3238,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) {
Signature · 1 line
2.17.1
PATCH v2 3/4 staging: rtl8723bs: hal: Replace variable==NULL comparisions with !variable
In reply to Himadri PandyaRemove comparision to NULL. Suggested by Coccinelle.
---
Changes in V2:
- Change subject line
--- drivers/staging/rtl8723bs/hal/hal_btcoex.c | 8 ++++---- drivers/staging/rtl8723bs/hal/hal_com.c | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-)
drivers/staging/rtl8723bs/hal/hal_btcoex.c +4 -4
@@ -75,7 +75,7 @@ static BTCDBGINFO GLBtcDbgInfo;static void DBG_BT_INFO_INIT (PBTCDBGINFO pinfo,u8 *pbuf,u32 size) { -if (NULL == pinfo) +if (!pinfo)return ;memset (pinfo,0 ,sizeof (BTCDBGINFO ));
@@ -95,7 +95,7 @@ void DBG_BT_INFO(u8 *dbgmsg) pinfo = &GLBtcDbgInfo; -if (NULL == pinfo->info) +if (!pinfo->info)return ; msglen =strlen (dbgmsg);
@@ -1571,7 +1571,7 @@ void hal_btcoex_SetDBG(struct adapter *padapter, u32 *pDbgModule)u32 i; -if (NULL == pDbgModule) +if (!pDbgModule)return ;for (i =0 ; i <BTC_MSG_MAX ; i++)
@@ -1585,7 +1585,7 @@ u32 hal_btcoex_GetDBG(struct adapter *padapter, u8 *pStrBuf, u32 bufSize)u32 leftSize; -if ((NULL == pStrBuf) || (0 == bufSize)) +if (!pStrBuf || (0 == bufSize))return 0 ; pstr = pStrBuf;
drivers/staging/rtl8723bs/hal/hal_com.c +4 -4
@@ -18,7 +18,7 @@ u8 rtw_hal_data_init(struct adapter *padapter)if (is_primary_adapter (padapter)) {/* if (padapter->isprimary) */ padapter->hal_data_sz =sizeof (struct hal_com_data ); padapter->HalData =vzalloc (padapter->hal_data_sz); -if (padapter->HalData ==NULL ) { +if (!padapter->HalData) {DBG_8192C ("cannot alloc memory for HAL DATA\n" );return _FAIL; }
@@ -909,7 +909,7 @@ s32 c2h_evt_read_88xx(struct adapter *adapter, u8 *buf)int i;u8 trigger; -if (buf ==NULL ) +if (!buf) goto exit; trigger =rtw_read8 (adapter,REG_C2HEVT_CLEAR );
@@ -982,7 +982,7 @@ void rtw_hal_update_sta_rate_mask(struct adapter *padapter, struct sta_info *pstu8 i, rf_type, limit;u32 tx_ra_bitmap; -if (psta ==NULL ) +if (!psta)return ; tx_ra_bitmap =0 ;
@@ -1407,7 +1407,7 @@ bool GetHexValueFromString(char *szStr, u32 *pu4bVal, u32 *pu4bMove)char *szScan = szStr;/* Check input parameter. */ -if (szStr ==NULL || pu4bVal ==NULL || pu4bMove ==NULL ) { +if (!szStr || !pu4bVal || !pu4bMove) {DBG_871X ("GetHexValueFromString(): Invalid input arguments! szStr: %p, pu4bVal: %p, pu4bMove: %p\n" , szStr, pu4bVal, pu4bMove);return false;
Signature · 1 line
2.17.1
PATCH v2 4/4 staging: rtl8723bs: hal: Modify comparision to keep constant at right
In reply to Himadri PandyaModify comparision statement to keep the constant '0' on right hand side to follow kernel coding style.
---
Changes in V2:
- Add this new change to the patchset
--- drivers/staging/rtl8723bs/hal/hal_btcoex.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/rtl8723bs/hal/hal_btcoex.c +1 -1
@@ -1585,7 +1585,7 @@ u32 hal_btcoex_GetDBG(struct adapter *padapter, u8 *pStrBuf, u32 bufSize)u32 leftSize; -if (!pStrBuf || (0 == bufSize)) +if (!pStrBuf || (bufSize ==0 ))return 0 ; pstr = pStrBuf;
Signature · 1 line
2.17.1
Quoted 10 lines · Himadri Pandya
- This patchset removes comparision to NULL in various files of
drivers/staging/rtl8723bs/hal/.- The changes are broken into separate patches to keep the length of each patch below/near 100 lines for convinient reviewing.
v2:
- Change subject lines of patches
- Include a new patch to modify comparision with a constant
Quoted 5 lines
Himadri Pandya (4):
staging: rtl8723bs: hal: Remove comparisions to NULL
staging: rtl8723bs: hal: Remove NULL comparisions
staging: rtl8723bs: hal: Replace variable==NULL comparisions with
!variable
Sorry to be picky, but this is not the best way to make unique subjects. The different patches affect different files, so you can put something related to the affected file(s) in the subject line. You may just want to make a series of one file per patch, rather than aiming for 100 lines of changes.
julia
Quoted 19 lines
staging: rtl8723bs: hal: Modify comparision to keep constant at right
drivers/staging/rtl8723bs/hal/hal_btcoex.c | 8 ++++---- drivers/staging/rtl8723bs/hal/hal_com.c | 8 ++++---- drivers/staging/rtl8723bs/hal/hal_com_phycfg.c | 18 +++++++++--------- drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c | 8 ++++---- drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c | 6 +++--- 5 files changed, 24 insertions(+), 24 deletions(-)--
2.17.1--
You received this message because you are subscribed to the Google Groups "outreachy-kernel" group.
To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To post to this group, send email to [email protected].
To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/20190316123251.24875-1-himadri18.07%40gmail.com.
For more options, visit https://groups.google.com/d/optout.
Quoted 20 lines · Julia Lawall
Quoted 10 lines · Himadri Pandya
- This patchset removes comparision to NULL in various files of
drivers/staging/rtl8723bs/hal/.- The changes are broken into separate patches to keep the length of each patch below/near 100 lines for convinient reviewing.
v2:
- Change subject lines of patches
- Include a new patch to modify comparision with a constantQuoted 5 lines
Himadri Pandya (4):
staging: rtl8723bs: hal: Remove comparisions to NULL
staging: rtl8723bs: hal: Remove NULL comparisions
staging: rtl8723bs: hal: Replace variable==NULL comparisions with
!variable
Quoted 8 lines
Sorry to be picky, but this is not the best way to make unique subjects. The different patches affect different files, so you can put something related to the affected file(s) in the subject line. You may just want to make a series of one file per patch, rather than aiming for 100 lines of changes.
julia
That is absolutely a better option. I will do that and send a new version.
Thank you.
- Himadri
Quoted 36 lines
Quoted 10 lines
staging: rtl8723bs: hal: Modify comparision to keep constant at right
drivers/staging/rtl8723bs/hal/hal_btcoex.c | 8 ++++---- drivers/staging/rtl8723bs/hal/hal_com.c | 8 ++++---- drivers/staging/rtl8723bs/hal/hal_com_phycfg.c | 18 +++++++++--------- drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c | 8 ++++---- drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c | 6 +++--- 5 files changed, 24 insertions(+), 24 deletions(-)Quoted 5 lines
--
2.17.1--
You received this message because you are subscribed to the GoogleGroups "outreachy-kernel" group.
Quoted 1 line
To unsubscribe from this group and stop receiving emails from it, send
an email to [email protected].
Quoted 2 lines
To post to this group, send email to [email protected]. To view this discussion on the web visit
https://groups.google.com/d/msgid/outreachy-kernel/20190316123251.24875-1-himadri18.07%40gmail.com
.Quoted 2 lines
For more options, visit https://groups.google.com/d/optout.
--
You received this message because you are subscribed to the Google Groups "outreachy-kernel" group.
To unsubscribe from this group and stop receiving emails from it, send an email to [email protected].
To post to this group, send email to [email protected]. To view this discussion on the web visit
https://groups.google.com/d/msgid/outreachy-kernel/alpine.DEB.2.21.1903161424100.2487%40hadrien
.
For more options, visit https://groups.google.com/d/optout.