Skip to contentSkip to conversation

remove useless null checks before free

PATCH In review Stephen Hemminger 3 participants 8 messages Apr 1 – Jun 3 Network drivers

lore
Share & tools
lore
#0 lore raw

cover remove useless null checks before free

Some small cleanups found by coccinelle null free script

Stephen Hemminger (4):
net/ice: remove unnecessary null check net/bnxt: remove unnecessary null check net/zxdh: remove unnecessary null check app/test_compress: remove unnecessary null check

 app/test-compress-perf/main.c         | 6 ++----
 drivers/net/bnxt/tf_core/v3/tfo.c     | 6 ++----
 drivers/net/bnxt/tf_ulp/ulp_sc_mgr.c  | 6 ++----
 drivers/net/intel/ice/ice_dcf_sched.c | 6 ++----
 drivers/net/zxdh/zxdh_np.c            | 3 +--
 5 files changed, 9 insertions(+), 18 deletions(-)
Signature · 1 line
2.53.0
#1 lore raw

PATCH 1/4 net/ice: remove unnecessary null check

No need to check for null before calling free.
Found by coccinelle script null_free.

---
 drivers/net/intel/ice/ice_dcf_sched.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/net/intel/ice/ice_dcf_sched.c +2 -4
index 948774a282..14e902edbe 100644
@@ -877,10 +877,8 @@ static int ice_dcf_hierarchy_commit(struct rte_eth_dev *dev,
 	return ret_val;
 
 fail_clear:
-	if (vf_bw != NULL)
-		free(vf_bw);
-	if (tc_bw != NULL)
-		free(tc_bw);
+	free(vf_bw);
+	free(tc_bw);
 
 	/* clear all the traffic manager configuration */
 	if (clear_on_fail) {
Signature · 1 line
2.53.0
#3 lore raw

PATCH 2/4 net/bnxt: remove unnecessary null check

In reply to Stephen Hemminger

No need to check for null before calling free.
Found by coccinelle script null_free.

---
 drivers/net/bnxt/tf_core/v3/tfo.c    | 6 ++----
 drivers/net/bnxt/tf_ulp/ulp_sc_mgr.c | 6 ++----
 2 files changed, 4 insertions(+), 8 deletions(-)
drivers/net/bnxt/tf_core/v3/tfo.c +2 -4
index 4b1f545476..681d1dd8d3 100644
@@ -183,13 +183,11 @@ void tfo_close(void **tfo)
 				}
 			}
 		}
-		if (tim)
-			rte_free(tim);
+		rte_free(tim);
 		tfco->ts_tim = NULL;
 		tfco->tfgo = NULL;
 
-		if (*tfo)
-			rte_free(*tfo);
+		rte_free(*tfo);
 		*tfo = NULL;
 	}
 }
drivers/net/bnxt/tf_ulp/ulp_sc_mgr.c +2 -4
index 23e1b59ca4..3707cd1a2d 100644
@@ -169,11 +169,9 @@ ulp_sc_mgr_deinit(struct bnxt_ulp_context *ctxt)
 
 	ulp_sc_mgr_thread_cancel(ctxt);
 
-	if (ulp_sc_info->stats_cache_tbl)
-		rte_free(ulp_sc_info->stats_cache_tbl);
+	rte_free(ulp_sc_info->stats_cache_tbl);
 
-	if (ulp_sc_info->read_data)
-		rte_free(ulp_sc_info->read_data);
+	rte_free(ulp_sc_info->read_data);
 
 	rte_free(ulp_sc_info);
 
Signature · 1 line
2.53.0
#4 lore raw

PATCH 3/4 net/zxdh: remove unnecessary null check

In reply to Stephen Hemminger

No need to check for null before calling free.
Found by coccinelle script null_free.

---
 drivers/net/zxdh/zxdh_np.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/net/zxdh/zxdh_np.c +1 -2
index efb57e34f2..b078ec5b6c 100644
@@ -12383,8 +12383,7 @@ zxdh_np_dtb_acl_data_clear(uint32_t dev_id, uint32_t queue_id,
 				&element_id);
 	free(data_buff);
 	free(mask_buff);
-	if (eram_buff)
-		free(eram_buff);
+	free(eram_buff);
 
 	free(p_entry_arr);
 	ZXDH_COMM_CHECK_DEV_RC(dev_id, rc, "zxdh_np_dtb_acl_dma_insert");
Signature · 1 line
2.53.0
#6 lore raw

PATCH 4/4 app/test_compress: remove unnecessary null check

In reply to Stephen Hemminger

No need to check for null before calling free.
Found by coccinelle script null_free.

---
 app/test-compress-perf/main.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
app/test-compress-perf/main.c +2 -4
index c9ead02cb4..bc2b185da4 100644
@@ -392,15 +392,13 @@ comp_perf_dump_dictionary_data(struct comp_test_data *td)
 
 		if (fread(data, data_to_read, 1, f) != 1) {
 			RTE_LOG(ERR, USER1, "Input file could not be read\n");
-			if (td->dictionary_data)
-				rte_free(td->dictionary_data);
+			rte_free(td->dictionary_data);
 			goto end;
 		}
 		if (fseek(f, 0, SEEK_SET) != 0) {
 			RTE_LOG(ERR, USER1,
 				"Size of input could not be calculated\n");
-			if (td->dictionary_data)
-				rte_free(td->dictionary_data);
+			rte_free(td->dictionary_data);
 			goto end;
 		}
 		remaining_data -= data_to_read;
Signature · 1 line
2.53.0
Acked-by on v1 1/4
#2 lore raw

Re: [PATCH 1/4] net/ice: remove unnecessary null check

In reply to Stephen Hemminger
Quoted 8 lines · Stephen Hemminger

No need to check for null before calling free.
Found by coccinelle script null_free.

---
 drivers/net/intel/ice/ice_dcf_sched.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
Quoted 20 lines
drivers/net/intel/ice/ice_dcf_sched.c +2 -4
index 948774a282..14e902edbe 100644
@@ -877,10 +877,8 @@ static int ice_dcf_hierarchy_commit(struct rte_eth_dev *dev,
 	return ret_val;
 
 fail_clear:
-	if (vf_bw != NULL)
-		free(vf_bw);
-	if (tc_bw != NULL)
-		free(tc_bw);
+	free(vf_bw);
+	free(tc_bw);
 
 	/* clear all the traffic manager configuration */
 	if (clear_on_fail) {
Signature · 1 line
2.53.0
#7 lore raw
In reply to Stephen Hemminger

01/04/2026 18:40, Stephen Hemminger:

Quoted 7 lines

Some small cleanups found by coccinelle null free script

Stephen Hemminger (4):
net/ice: remove unnecessary null check net/bnxt: remove unnecessary null check net/zxdh: remove unnecessary null check app/test_compress: remove unnecessary null check

zxdh was merged in next-net

The rest is applied, thanks.