Skip to contentSkip to conversation

more null pointer check removal

PATCH In review Stephen Hemminger 5 participants 8 messages Jun 22, 2022 – Jun 24, 2022

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

cover more null pointer check removal

Reran the Cocci script to check for unnecessary null pointer comparisons before free related functions.

Stephen Hemminger (3):
vdpa/mlx5: remove unnecessary null check
raw/ifpga: remove unnecessary null check
dmap/dpaa2: remove unnecessary null check

 drivers/dma/dpaa2/dpaa2_qdma.c      | 6 ++----
 drivers/raw/ifpga/ifpga_rawdev.c    | 3 +--
 drivers/vdpa/mlx5/mlx5_vdpa_virtq.c | 3 +--
 3 files changed, 4 insertions(+), 8 deletions(-)
Signature · 1 line
2.35.1
#1 lore raw

PATCH 1/3 vdpa/mlx5: remove unnecessary null check

Found by nullfree.cocci.

---
 drivers/vdpa/mlx5/mlx5_vdpa_virtq.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/vdpa/mlx5/mlx5_vdpa_virtq.c +1 -2
index e025be47d277..e06d6afb676f 100644
@@ -285,8 +285,7 @@ mlx5_vdpa_virtq_setup(struct mlx5_vdpa_priv *priv, int index)
 		if (virtq->umems[i].obj)
 			claim_zero(mlx5_glue->devx_umem_dereg
 				   (virtq->umems[i].obj));
-		if (virtq->umems[i].buf)
-			rte_free(virtq->umems[i].buf);
+		rte_free(virtq->umems[i].buf);
 		virtq->umems[i].size = 0;
 		virtq->umems[i].obj = NULL;
 		virtq->umems[i].buf = NULL;
Signature · 1 line
2.35.1
#3 lore raw

PATCH 2/3 raw/ifpga: remove unnecessary null check

In reply to Stephen Hemminger

The function rte_kvargs_free handles calling with NULL. Found by nullfree.cocci.

---
 drivers/raw/ifpga/ifpga_rawdev.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/raw/ifpga/ifpga_rawdev.c +1 -2
index ceb18aed8d44..8c05302a65b8 100644
@@ -1768,8 +1768,7 @@ ifpga_vdev_parse_devargs(struct rte_devargs *devargs,
 	ret = 0;
 
 end:
-	if (kvlist)
-		rte_kvargs_free(kvlist);
+	rte_kvargs_free(kvlist);
 
 	return ret;
 }
Signature · 1 line
2.35.1
#4 lore raw

PATCH 3/3 dmap/dpaa2: remove unnecessary null check

In reply to Stephen Hemminger

The function rte_free already handles being called with NULL. Found by nullfree.cocci.

---
 drivers/dma/dpaa2/dpaa2_qdma.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/dma/dpaa2/dpaa2_qdma.c +2 -4
index a93a60565df7..0500e8c22590 100644
@@ -1404,11 +1404,9 @@ dpaa2_qdma_reset(struct rte_dma_dev *dev)
 
 	/* Reset and free virtual queues */
 	for (i = 0; i < qdma_dev->num_vqs; i++) {
-		if (qdma_dev->vqs[i].status_ring)
-			rte_ring_free(qdma_dev->vqs[i].status_ring);
+		rte_ring_free(qdma_dev->vqs[i].status_ring);
 	}
-	if (qdma_dev->vqs)
-		rte_free(qdma_dev->vqs);
+	rte_free(qdma_dev->vqs);
 	qdma_dev->vqs = NULL;
 
 	/* Reset QDMA device structure */
Signature · 1 line
2.35.1
#5 lore raw
In reply to Stephen Hemminger
Quoted 8 lines · Stephen Hemminger

Reran the Cocci script to check for unnecessary null pointer comparisons before free related functions.

Stephen Hemminger (3):
vdpa/mlx5: remove unnecessary null check
raw/ifpga: remove unnecessary null check
dmap/dpaa2: remove unnecessary null check

Quoted 6 lines
 drivers/dma/dpaa2/dpaa2_qdma.c      | 6 ++----
 drivers/raw/ifpga/ifpga_rawdev.c    | 3 +--
 drivers/vdpa/mlx5/mlx5_vdpa_virtq.c | 3 +--
 3 files changed, 4 insertions(+), 8 deletions(-)
#6 lore raw
In reply to Stephen Hemminger
Quoted 13 lines · Stephen Hemminger

Reran the Cocci script to check for unnecessary null pointer comparisons before free related functions.

Stephen Hemminger (3):
vdpa/mlx5: remove unnecessary null check
raw/ifpga: remove unnecessary null check
dmap/dpaa2: remove unnecessary null check

 drivers/dma/dpaa2/dpaa2_qdma.c      | 6 ++----
 drivers/raw/ifpga/ifpga_rawdev.c    | 3 +--
 drivers/vdpa/mlx5/mlx5_vdpa_virtq.c | 3 +--
 3 files changed, 4 insertions(+), 8 deletions(-)