Skip to contentSkip to conversation

Cleanup duplicate NULL tests on a value

PATCH In review Abraham Samuel Adekunle 2 participants 5 messages Apr 18, 2025 – Apr 19, 2025 Staging

lore
Share & tools
lore
#0 lore raw

v6 cover Cleanup duplicate NULL tests on a value

Changes in v5:
- Splitted patch v4 into a patchset with two patches so as to
proper explanation of each change due to different code patterns
in the change as suggested by Julia Lawall.
- Modified commit messages in each patch to properly explain the changes show the initial NULL tests on the value.
- Added Subject title to each patch to be specific to the value being NULL tested.
Changed in v4:

	- Separated initially integrated suggested change
	 "use modulo % 4096 over & 0xfff" to a different patch.

Changes in v3:
- Changed other cases to use modulo (% 4096) over (& 0xofff).
- Modified commit message to reflect these changes.
Changes in v2:
- Dropped patch files for media drivers from patchset as it is not meant for outreachy applicants.
- Added full-stop aign to text in commit message.
- Made code more readable by adding a line break.
- Changed cases to use modulo (% 4096) over (& 0xfff).
Changes in v1
- Patch for drivers/staging/media/av7110/sp8870.c and
- drivers/staging/media/atomisp/pci/atomisp_gmin_platform.c
is split into two different patches in the patchset for use by the different driver maintainers.
- Added subject title for each of the separated patches.
- Patch 1: Removed unnecessary curly braces {} initially inserted.
- Patch 2: Unnecessary {} was also removed for v1.

Abraham Samuel Adekunle (2):
staging: rtl8723bs: Remove duplicate NULL tests on pstat
staging: rtl8723bs: Prevent duplicate NULL tests on psta pointer

 drivers/staging/rtl8723bs/core/rtw_mlme_ext.c |  2 +-
 drivers/staging/rtl8723bs/core/rtw_xmit.c     | 62 +++++++++----------
 2 files changed, 31 insertions(+), 33 deletions(-)
Signature · 1 line
2.34.1
#1 lore raw

PATCH v6 1/2 staging: rtl8723bs: Remove duplicate NULL tests on pstat

The pstat pointer has been previously tested for NULL after being initialized as seen from line 970-973 of the file.
The first NULL test is shown below:

		pstat = rtw_get_stainfo(pstapriv, GetAddr2Ptr(pframe));
		 if (!pstat) {
			 status = WLAN_REASON_CLASS2_FRAME_FROM_NONAUTH_STA;
			goto asoc_class2_error;
		}

Remove the second NULL test to avoid redundancy in code.

Found by Coccinelle

---
 drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +1 -1
index e74fb7d5dc37..863c188a3cfb 100644
@@ -1323,7 +1323,7 @@ unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame)
 	spin_unlock_bh(&pstapriv->asoc_list_lock);
 
 	/*  now the station is qualified to join our BSS... */
-	if (pstat && (pstat->state & WIFI_FW_ASSOC_SUCCESS) && (status == WLAN_STATUS_SUCCESS)) {
+	if ((pstat->state & WIFI_FW_ASSOC_SUCCESS) && (status == WLAN_STATUS_SUCCESS)) {
 		/* 1 bss_cap_update & sta_info_update */
 		bss_cap_update_on_sta_join(padapter, pstat);
 		sta_info_update(padapter, pstat);
Signature · 1 line
2.34.1
#2 lore raw

Re: [PATCH v6 1/2] staging: rtl8723bs: Remove duplicate NULL tests on pstat

Quoted 9 lines · Abraham Samuel Adekunle

The pstat pointer has been previously tested for NULL after being initialized as seen from line 970-973 of the file.
The first NULL test is shown below:

		pstat = rtw_get_stainfo(pstapriv, GetAddr2Ptr(pframe));
		 if (!pstat) {
			 status = WLAN_REASON_CLASS2_FRAME_FROM_NONAUTH_STA;
			goto asoc_class2_error;
		}

It's too much for such a change. You can do that in the comment area (after '---' line below), or drop it completely. You can rephrase that the pointer is checked before the changed lines.

Quoted 3 lines

Remove the second NULL test to avoid redundancy in code.

Found by Coccinelle

Missing period.

Signature · 2 lines
With Best Regards,
Andy Shevchenko
#3 lore raw

PATCH v6 2/2 staging: rtl8723bs: Prevent duplicate NULL tests on psta pointer

In reply to Abraham Samuel Adekunle

The psta pointer had previously been tested for NULL after initialization, as seen in the code below:

		psta = rtw_get_stainfo(&padapter->stapriv, pattrib->ra);
		...
                if (!psta)
			return _FAIL;

This makes a second NULL test on psta unnecessary.

Remove the second NULL test on psta to avoid redundancy in code.

Found by Cocinelle

---
 drivers/staging/rtl8723bs/core/rtw_xmit.c | 62 +++++++++++------------
 1 file changed, 30 insertions(+), 32 deletions(-)
drivers/staging/rtl8723bs/core/rtw_xmit.c +30 -32
index 026d58b4bd7f..e933ccda1b39 100644
@@ -941,38 +941,36 @@ s32 rtw_make_wlanhdr(struct adapter *padapter, u8 *hdr, struct pkt_attrib *pattr
 			if (!(psta->state & _FW_LINKED))
 				return _FAIL;
 
-			if (psta) {
-				psta->sta_xmitpriv.txseq_tid[pattrib->priority]++;
-				psta->sta_xmitpriv.txseq_tid[pattrib->priority] %= 4096u;
-				pattrib->seqnum = psta->sta_xmitpriv.txseq_tid[pattrib->priority];
-
-				SetSeqNum(hdr, pattrib->seqnum);
-
-				/* check if enable ampdu */
-				if (pattrib->ht_en && psta->htpriv.ampdu_enable)
-					if (psta->htpriv.agg_enable_bitmap & BIT(pattrib->priority))
-						pattrib->ampdu_en = true;
-
-				/* re-check if enable ampdu by BA_starting_seqctrl */
-				if (pattrib->ampdu_en == true) {
-					u16 tx_seq;
-
-					tx_seq = psta->BA_starting_seqctrl[pattrib->priority & 0x0f];
-
-					/* check BA_starting_seqctrl */
-					if (SN_LESS(pattrib->seqnum, tx_seq)) {
-						pattrib->ampdu_en = false;/* AGG BK */
-					} else if (SN_EQUAL(pattrib->seqnum, tx_seq)) {
-						psta->BA_starting_seqctrl[pattrib->priority & 0x0f] =
-							(tx_seq + 1) % 4096u;
-
-						pattrib->ampdu_en = true;/* AGG EN */
-					} else {
-						psta->BA_starting_seqctrl[pattrib->priority & 0x0f] =
-							(pattrib->seqnum + 1) % 4096u;
-
-						pattrib->ampdu_en = true;/* AGG EN */
-					}
+			psta->sta_xmitpriv.txseq_tid[pattrib->priority]++;
+			psta->sta_xmitpriv.txseq_tid[pattrib->priority] %= 4096u;
+			pattrib->seqnum = psta->sta_xmitpriv.txseq_tid[pattrib->priority];
+
+			SetSeqNum(hdr, pattrib->seqnum);
+
+			/* check if enable ampdu */
+			if (pattrib->ht_en && psta->htpriv.ampdu_enable)
+				if (psta->htpriv.agg_enable_bitmap & BIT(pattrib->priority))
+					pattrib->ampdu_en = true;
+
+			/* re-check if enable ampdu by BA_starting_seqctrl */
+			if (pattrib->ampdu_en == true) {
+				u16 tx_seq;
+
+				tx_seq = psta->BA_starting_seqctrl[pattrib->priority & 0x0f];
+
+				/* check BA_starting_seqctrl */
+				if (SN_LESS(pattrib->seqnum, tx_seq)) {
+					pattrib->ampdu_en = false;/* AGG BK */
+				} else if (SN_EQUAL(pattrib->seqnum, tx_seq)) {
+					psta->BA_starting_seqctrl[pattrib->priority & 0x0f] =
+						(tx_seq + 1) % 4096u;
+
+					pattrib->ampdu_en = true;/* AGG EN */
+				} else {
+					psta->BA_starting_seqctrl[pattrib->priority & 0x0f] =
+						(pattrib->seqnum + 1) % 4096u;
+
+					pattrib->ampdu_en = true;/* AGG EN */
 				}
 			}
 		}
Signature · 1 line
2.34.1
#4 lore raw

Re: [PATCH v6 2/2] staging: rtl8723bs: Prevent duplicate NULL tests on psta pointer

Quoted 7 lines · Abraham Samuel Adekunle

The psta pointer had previously been tested for NULL after initialization, as seen in the code below:

		psta = rtw_get_stainfo(&padapter->stapriv, pattrib->ra);
		...
                if (!psta)
			return _FAIL;
Quoted 5 lines

This makes a second NULL test on psta unnecessary.

Remove the second NULL test on psta to avoid redundancy in code.

Found by Cocinelle

Missing period.

P.S. Here the commit message is fine, however misindented (check the indentation).

Signature · 2 lines
With Best Regards,
Andy Shevchenko