Skip to contentSkip to conversation

staging: rtl8723bs: hal: Modify comparisons

PATCH Superseded Himadri Pandya 2 participants 13 messages Mar 16, 2019 – Mar 17, 2019 Staging

v3 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

v3 cover staging: rtl8723bs: hal: Modify comparisons

This patchset
- Removes comparison to NULL in various files of drivers/staging/rtl8723bs/hal/
- Modifies comparison to constant in order to follow kernel coding style of constant appears on right side

V2:
- Change subject lines of patches
- Include modification to comparison to constants

V3:
- Break changes into changes per file

Himadri Pandya (9):
staging: rtl8723bs: hal: Remove comparison to NULL in

    rtl8723b_rxdesc.c
  staging: rtl8723bs: hal: Remove comparison to NULL in rtl8723bs_recv.c
  staging: rtl8723bs: hal: Remove comparison to NULL in
    rtl8723b_hal_init.c

staging: rtl8723bs: hal: Remove comparison to NULL in rtl8723b_dm.c
staging: rtl8723bs: hal: Modify comparisons in rtl8723bs_xmit.c
staging: rtl8723bs: hal: Remove comparison to NULL in rtl8723b_cmd.c
staging: rtl8723bs: hal: Remove comparison to NULL in hal_com_phycfg.c
staging: rtl8723bs: hal: Remove comparison to NULL in hal_com.c
staging: rtl8723bs: hal: Modify comparisons in hal_btcoex.c

 drivers/staging/rtl8723bs/hal/hal_btcoex.c       | 11 +++++------
 drivers/staging/rtl8723bs/hal/hal_com.c          |  8 ++++----
 drivers/staging/rtl8723bs/hal/hal_com_phycfg.c   | 16 ++++++++--------
 drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c     | 12 ++++++------
 drivers/staging/rtl8723bs/hal/rtl8723b_dm.c      |  2 +-
 .../staging/rtl8723bs/hal/rtl8723b_hal_init.c    |  8 ++++----
 drivers/staging/rtl8723bs/hal/rtl8723b_rxdesc.c  |  2 +-
 drivers/staging/rtl8723bs/hal/rtl8723bs_recv.c   |  8 ++++----
 drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c   |  9 ++++-----
 9 files changed, 37 insertions(+), 39 deletions(-)
Signature · 1 line
2.17.1
#1 lore raw

PATCH v3 1/9 staging: rtl8723bs: hal: Remove comparison to NULL in rtl8723b_rxdesc.c

Remove comparison to null in file rtl8723b_rxdesc.c. Suggested by Coccinelle.

---
Changes in V2:
- Change subject line

Changes in V3:
- Break changes into changes per file

---
 drivers/staging/rtl8723bs/hal/rtl8723b_rxdesc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/rtl8723bs/hal/rtl8723b_rxdesc.c +1 -1
index 76c8e6e9e6bc..86512264e280 100644
@@ -34,7 +34,7 @@ static void process_link_qual(struct adapter *padapter, union recv_frame *prfram
 	struct rx_pkt_attrib *pattrib;
 	struct signal_stat *signal_stat;
 
-	if (prframe == NULL || padapter == NULL)
+	if (!prframe || !padapter)
 		return;
 
 	pattrib = &prframe->u.hdr.attrib;
Signature · 1 line
2.17.1
#2 lore raw

PATCH v3 2/9 staging: rtl8723bs: hal: Remove comparison to NULL in rtl8723bs_recv.c

In reply to Himadri Pandya

Remove comparison to NULL in file rtl8723bs_recv.c. Suggested by Coccinelle.

---
Changes in V2:
- Change subject line

Changes in V3:
- Break changes into changes per file

---
 drivers/staging/rtl8723bs/hal/rtl8723bs_recv.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/staging/rtl8723bs/hal/rtl8723bs_recv.c +4 -4
index 26742960ed65..b269de52e535 100644
@@ -170,7 +170,7 @@ static void rtl8723bs_c2h_packet_handler(struct adapter *padapter,
 	/* DBG_871X("+%s() length =%d\n", __func__, length); */
 
 	tmp = rtw_zmalloc(length);
-	if (tmp == NULL)
+	if (!tmp)
 		return;
 
 	memcpy(tmp, pbuf, length);
@@ -424,7 +424,7 @@ s32 rtl8723bs_init_recv_priv(struct adapter *padapter)
 
 	n = NR_RECVBUFF * sizeof(struct recv_buf) + 4;
 	precvpriv->pallocated_recv_buf = rtw_zmalloc(n);
-	if (precvpriv->pallocated_recv_buf == NULL) {
+	if (!precvpriv->pallocated_recv_buf) {
 		res = _FAIL;
 		RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, ("alloc recv_buf fail!\n"));
 		goto exit;
@@ -439,7 +439,7 @@ s32 rtl8723bs_init_recv_priv(struct adapter *padapter)
 		if (res == _FAIL)
 			break;
 
-		if (precvbuf->pskb == NULL) {
+		if (!precvbuf->pskb) {
 			SIZE_PTR tmpaddr = 0;
 			SIZE_PTR alignment = 0;
 
@@ -453,7 +453,7 @@ s32 rtl8723bs_init_recv_priv(struct adapter *padapter)
 				skb_reserve(precvbuf->pskb, (RECVBUFF_ALIGN_SZ - alignment));
 			}
 
-			if (precvbuf->pskb == NULL) {
+			if (!precvbuf->pskb) {
 				DBG_871X("%s: alloc_skb fail!\n", __func__);
 			}
 		}
Signature · 1 line
2.17.1
#3 lore raw

PATCH v3 3/9 staging: rtl8723bs: hal: Remove comparison to NULL in rtl8723b_hal_init.c

In reply to Himadri Pandya

Remove comparison to NULL in file rtl8723b_hal_init.c. Suggested by Coccinelle.

---
Changes in V2:
- Change subject line

Changes in V3:
- Break changes into changes per file

---
 drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +4 -4
index 85fd12cca4ae..caa8e2f39448 100644
@@ -883,7 +883,7 @@ static void hal_ReadEFuse_WiFi(
 	}
 
 	efuseTbl = rtw_malloc(EFUSE_MAX_MAP_LEN);
-	if (efuseTbl == NULL) {
+	if (!efuseTbl) {
 		DBG_8192C("%s: alloc efuseTbl fail!\n", __func__);
 		return;
 	}
@@ -1463,7 +1463,7 @@ static s32 Hal_EfusePgPacketRead(
 	s32	ret;
 
 
-	if (data == NULL)
+	if (!data)
 		return false;
 
 	EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_EFUSE_MAX_SECTION, &max_section, bPseudoTest);
@@ -3664,7 +3664,7 @@ s32 c2h_handler_8723b(struct adapter *padapter, u8 *buf)
 	s32 ret = _SUCCESS;
 	u8 index = 0;
 
-	if (pC2hEvent == NULL) {
+	if (!pC2hEvent) {
 		DBG_8192C("%s(): pC2hEventis NULL\n", __func__);
 		ret = _FAIL;
 		goto exit;
@@ -3714,7 +3714,7 @@ static void process_c2h_event(struct adapter *padapter, PC2H_EVT_HDR pC2hEvent,
 {
 	u8 index = 0;
 
-	if (c2hBuf == NULL) {
+	if (!c2hBuf) {
 		DBG_8192C("%s c2hbuff is NULL\n", __func__);
 		return;
 	}
Signature · 1 line
2.17.1
#4 lore raw

PATCH v3 4/9 staging: rtl8723bs: hal: Remove comparison to NULL in rtl8723b_dm.c

In reply to Himadri Pandya

Remove comparison to NULL in file rtl8723b_dm.c. Suggested by Coccinelle.

---
Changes in V2:
- Change subject line

Changes in V3:
- Break changes into changes per file

---
 drivers/staging/rtl8723bs/hal/rtl8723b_dm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/rtl8723bs/hal/rtl8723b_dm.c +1 -1
index 6b6fc835c601..65781477cac9 100644
@@ -254,7 +254,7 @@ void rtl8723b_HalDmWatchDog_in_LPS(struct adapter *Adapter)
 
       /* 1 Find MIN-RSSI */
 	psta = rtw_get_stainfo(pstapriv, get_bssid(pmlmepriv));
-	if (psta == NULL)
+	if (!psta)
 		goto skip_lps_dm;
 
 	pdmpriv->EntryMinUndecoratedSmoothedPWDB = psta->rssi_stat.UndecoratedSmoothedPWDB;
Signature · 1 line
2.17.1
#5 lore raw

PATCH v3 5/9 staging: rtl8723bs: hal: Modify comparisons in rtl8723bs_xmit.c

In reply to Himadri Pandya

- Remove comparison to NULL in file rtl8723bs_xmit.c. Suggested by Coccinelle.
- Modify comparison to true in order to follow kernel coding style of keeping constant to the right side.

---
Changes in V2:
- Change subject line

Changes in V3:
- Break changes into changes per file
- Include modification to comparision to true

---
 drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)
drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c +4 -5
index 69c4db5b5b0c..7b06aab04ee6 100644
@@ -58,12 +58,12 @@ static s32 rtl8723_dequeue_writeport(struct adapter *padapter)
 
 	ret = ret || check_fwstate(pmlmepriv, _FW_UNDER_SURVEY);
 
-	if (true == ret)
+	if (ret == true)
 		pxmitbuf = dequeue_pending_xmitbuf_under_survey(pxmitpriv);
 	else
 		pxmitbuf = dequeue_pending_xmitbuf(pxmitpriv);
 
-	if (pxmitbuf == NULL)
+	if (!pxmitbuf)
 		return true;
 
 	deviceId = ffaddr2deviceId(pdvobjpriv, pxmitbuf->ff_hwaddr);
@@ -283,8 +283,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) ||
+				if(	!pxmitbuf ||
 					((_RND(pxmitbuf->len, 8) + txlen) > max_xmit_len) ||
 					(k >= (rtw_hal_sdio_max_txoqt_free_space(padapter)-1))
 				) {
@@ -307,7 +306,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
#6 lore raw

Re: [Outreachy kernel] [PATCH v3 5/9] staging: rtl8723bs: hal: Modify comparisons in rtl8723bs_xmit.c

Quoted 3 lines · Himadri Pandya

- Remove comparison to NULL in file rtl8723bs_xmit.c. Suggested by Coccinelle.
- Modify comparison to true in order to follow kernel coding style of keeping constant to the right side.

These are different things. They don't affect the same code, so they shouldn't be in the same patch.

julia

Quoted 61 lines

---
Changes in V2:
- Change subject line

Changes in V3:
- Break changes into changes per file
- Include modification to comparision to true

---
 drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)
drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c +4 -6
index 69c4db5b5b0c..7b06aab04ee6 100644
@@ -58,12 +58,12 @@ static s32 rtl8723_dequeue_writeport(struct adapter *padapter)
 
 	ret = ret || check_fwstate(pmlmepriv, _FW_UNDER_SURVEY);
 
-	if (true == ret)
+	if (ret == true)
 		pxmitbuf = dequeue_pending_xmitbuf_under_survey(pxmitpriv);
 	else
 		pxmitbuf = dequeue_pending_xmitbuf(pxmitpriv);
 
-	if (pxmitbuf == NULL)
+	if (!pxmitbuf)
 		return true;
 
 	deviceId = ffaddr2deviceId(pdvobjpriv, pxmitbuf->ff_hwaddr);
@@ -283,8 +283,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) ||
+				if(	!pxmitbuf ||
 					((_RND(pxmitbuf->len, 8) + txlen) > max_xmit_len) ||
 					(k >= (rtw_hal_sdio_max_txoqt_free_space(padapter)-1))
 				) {
@@ -307,7 +306,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
--

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/20190316174543.36254-6-himadri18.07%40gmail.com.
For more options, visit https://groups.google.com/d/optout.

#7 lore raw

Re: [Outreachy kernel] [PATCH v3 5/9] staging: rtl8723bs: hal: Modify comparisons in rtl8723bs_xmit.c

Quoted 5 lines · Julia Lawall,
Quoted 1 line · Himadri Pandya

- Remove comparison to NULL in file rtl8723bs_xmit.c. Suggested by

Quoted 9 lines

Coccinelle.

Quoted 2 lines

- Modify comparison to true in order to follow kernel coding style of keeping constant to the right side.

These are different things. They don't affect the same code, so they shouldn't be in the same patch.

julia

Okay. Sending a revision taking care of it.

- Himadri

Quoted 75 lines
Quoted 6 lines

---
Changes in V2:
- Change subject line

Review

Quoted 8 lines

Changes in V3:
- Break changes into changes per file
- Include modification to comparision to true

---
 drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)
(quoted diff) +0 -0

b/drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c

drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c static s32 rtl8723_dequeue_writeport(struct adapter

Quoted 4 lines

index 69c4db5b5b0c..7b06aab04ee6 100644

drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c +0 -0
@@ -58,12 +58,12 @@ static s32 rtl8723_dequeue_writeport(struct adapter

*padapter)

drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c static s32 xmit_xmitframes(struct adapter *padapter,

Quoted 15 lines
drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c +2 -2
      ret = ret || check_fwstate(pmlmepriv, _FW_UNDER_SURVEY);
 
-     if (true == ret)
+     if (ret == true)
              pxmitbuf = dequeue_pending_xmitbuf_under_survey(pxmitpriv);
      else
              pxmitbuf = dequeue_pending_xmitbuf(pxmitpriv);
 
-     if (pxmitbuf == NULL)
+     if (!pxmitbuf)
              return true;
 
      deviceId = ffaddr2deviceId(pdvobjpriv, pxmitbuf->ff_hwaddr);
@@ -283,8 +283,7 @@ static s32 xmit_xmitframes(struct adapter *padapter,

struct xmit_priv *pxmitpriv

drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c static s32 xmit_xmitframes(struct adapter *padapter, · line 284

Quoted 3 lines
drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c +0 -0
                              /*  check xmit_buf size enough or not */
                              txlen = txdesc_size +

rtw_wlan_pkt_size(pxmitframe);

Quoted 6 lines
drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c +1 -2
-                             if (
-                                     (NULL == pxmitbuf) ||
+                             if(     !pxmitbuf ||
                                      ((_RND(pxmitbuf->len, 8) + txlen)

max_xmit_len) ||

                                      (k >=

(rtw_hal_sdio_max_txoqt_free_space(padapter)-1))

drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c static s32 xmit_xmitframes(struct adapter *padapter,

Quoted 2 lines
                              ) {
drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c +0 -0
@@ -307,7 +306,7 @@ static s32 xmit_xmitframes(struct adapter *padapter,

struct xmit_priv *pxmitpriv

drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c static s32 xmit_xmitframes(struct adapter *padapter, · line 308

Quoted 3 lines
drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c +0 -0
                                      }
 
                                      pxmitbuf =

rtw_alloc_xmitbuf(pxmitpriv);

drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c static s32 xmit_xmitframes(struct adapter *padapter, struct xmit_priv *pxmitpriv

Quoted 4 lines
drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c +1 -1
-                                     if (pxmitbuf == NULL) {
+                                     if (!pxmitbuf) {
 #ifdef DBG_XMIT_BUF
                                              DBG_871X_LEVEL(_drv_err_,

"%s: xmit_buf is not enough!\n", __func__);

Quoted 6 lines
drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c +0 -1
 #endif
--

2.17.1

--
You received this message because you are subscribed to the Google

Groups "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/20190316174543.36254-6-himadri18.07%40gmail.com
.

Quoted 2 lines

For more options, visit https://groups.google.com/d/optout.

#8 lore raw

PATCH v3 6/9 staging: rtl8723bs: hal: Remove comparison to NULL in rtl8723b_cmd.c

In reply to Himadri Pandya

Remove comparison to NULL in file rtl8723b_cmd.c. Suggested by Coccinelle.

---
Changes in V2:
- Change subject line

Changes in V3:
- Break changes into changes per file

---
 drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c +6 -6
index 9f4a10aaa774..fe3891106a6d 100644
@@ -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;
 	}
@@ -1620,7 +1620,7 @@ static void rtl8723b_set_FwRsvdPagePkt(
 
 	/* if the ap staion info. exists, get the kek, kck from staion info. */
 	psta = rtw_get_stainfo(pstapriv, get_bssid(pmlmepriv));
-	if (psta == NULL) {
+	if (!psta) {
 		memset(kek, 0, RTW_KEK_LEN);
 		memset(kck, 0, RTW_KCK_LEN);
 		DBG_8192C("%s, KEK, KCK download rsvd page all zero\n", __func__);
@@ -1856,7 +1856,7 @@ static void rtl8723b_set_AP_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;
 	}
Signature · 1 line
2.17.1
#9 lore raw

PATCH v3 7/9 staging: rtl8723bs: hal: Remove comparison to NULL in hal_com_phycfg.c

In reply to Himadri Pandya

Remove comparison to NULL in file hal_com_phycfg.c. Suggested by Coccinelle.

---
Changes in V2:
- Change subject line

Changes in V3:
-Break changes into changes per file

---
 drivers/staging/rtl8723bs/hal/hal_com_phycfg.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/staging/rtl8723bs/hal/hal_com_phycfg.c +8 -8
index 12c1cd590056..828b328adab8 100644
@@ -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) {
@@ -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
#10 lore raw

PATCH v3 8/9 staging: rtl8723bs: hal: Remove comparison to NULL in hal_com.c

In reply to Himadri Pandya

Remove comparison to NULL in file hal_com.c. Suggested by Coccinelle.

---
Changes in V2:
- Change subject line

Changes in V3:
- Break changes into changes per file

---
 drivers/staging/rtl8723bs/hal/hal_com.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/staging/rtl8723bs/hal/hal_com.c +4 -4
index 7f8ec55b08f1..b97b53c34449 100644
@@ -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 *pst
 	u8 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
#11 lore raw

PATCH v3 9/9 staging: rtl8723bs: hal: Modify comparisons in hal_btcoex.c

In reply to Himadri Pandya

- Remove comparison to NULL in file hal_btcoex.c. Suggested by Coccinelle.
- Modify comparison to 0 in order to follow the kernel coding style of constant appears on the right side.

---
Changes in V2:
- Change subject line
- Include modification to comparison to 0

Changes in V3:
- Break changes into changes per file

---
 drivers/staging/rtl8723bs/hal/hal_btcoex.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)
drivers/staging/rtl8723bs/hal/hal_btcoex.c +5 -6
index 2b43f6d3c762..6caddd7834a1 100644
@@ -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);
@@ -112,8 +112,7 @@ void DBG_BT_INFO(u8 *dbgmsg)
 /*  */
 static u8 halbtcoutsrc_IsBtCoexistAvailable(PBTC_COEXIST pBtCoexist)
 {
-	if (!pBtCoexist->bBinded ||
-		NULL == pBtCoexist->Adapter){
+	if (!pBtCoexist->bBinded || !pBtCoexist->Adapter){
 		return false;
 	}
 	return true;
@@ -1571,7 +1570,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 +1584,7 @@ u32 hal_btcoex_GetDBG(struct adapter *padapter, u8 *pStrBuf, u32 bufSize)
 	u32 leftSize;
 
 
-	if ((NULL == pStrBuf) || (0 == bufSize))
+	if (!pStrBuf || bufSize == 0)
 		return 0;
 
 	pstr = pStrBuf;
Signature · 1 line
2.17.1
#12 lore raw

Re: [Outreachy kernel] [PATCH v3 9/9] staging: rtl8723bs: hal: Modify comparisons in hal_btcoex.c

Quoted 4 lines · Himadri Pandya

- Remove comparison to NULL in file hal_btcoex.c. Suggested by Coccinelle.
- Modify comparison to 0 in order to follow the kernel coding style of constant appears on the right side.

This one should also be split up.

julia

Quoted 73 lines

---
Changes in V2:
- Change subject line
- Include modification to comparison to 0

Changes in V3:
- Break changes into changes per file

---
 drivers/staging/rtl8723bs/hal/hal_btcoex.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)
drivers/staging/rtl8723bs/hal/hal_btcoex.c +5 -7
index 2b43f6d3c762..6caddd7834a1 100644
@@ -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);
@@ -112,8 +112,7 @@ void DBG_BT_INFO(u8 *dbgmsg)
 /*  */
 static u8 halbtcoutsrc_IsBtCoexistAvailable(PBTC_COEXIST pBtCoexist)
 {
-	if (!pBtCoexist->bBinded ||
-		NULL == pBtCoexist->Adapter){
+	if (!pBtCoexist->bBinded || !pBtCoexist->Adapter){
 		return false;
 	}
 	return true;
@@ -1571,7 +1570,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 +1584,7 @@ u32 hal_btcoex_GetDBG(struct adapter *padapter, u8 *pStrBuf, u32 bufSize)
 	u32 leftSize;
 
 
-	if ((NULL == pStrBuf) || (0 == bufSize))
+	if (!pStrBuf || bufSize == 0)
 		return 0;
 
 	pstr = pStrBuf;
--

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/20190316174543.36254-10-himadri18.07%40gmail.com.
For more options, visit https://groups.google.com/d/optout.