Remove redundant NULL pointer checks before free functions
found by nullfree.cocci
Signed-off-by: Stephen Hemminger <step...@networkplumber.org>
Acked-by: Hemant Agrawal <hemant.agra...@nxp.com>
---
drivers/raw/cnxk_bphy/cnxk_bphy_cgx.c | 3 +--
drivers/raw/dpaa2_qdma/dpaa2_qdma.c | 15 +++++----------
drivers/raw/ifpga/ifpga_rawdev.c | 9 +++------
drivers/raw/skeleton/skeleton_rawdev_test.c | 6 ++----
4 files changed, 11 insertions(+), 22 deletions(-)
diff --git a/drivers/raw/cnxk_bphy/cnxk_bphy_cgx.c
b/drivers/raw/cnxk_bphy/cnxk_bphy_cgx.c
index 0b694e1c03c3..169cbc785531 100644
--- a/drivers/raw/cnxk_bphy/cnxk_bphy_cgx.c
+++ b/drivers/raw/cnxk_bphy/cnxk_bphy_cgx.c
@@ -233,8 +233,7 @@ cnxk_bphy_cgx_fini_queues(struct cnxk_bphy_cgx *cgx)
unsigned int i;
for (i = 0; i < cgx->num_queues; i++) {
- if (cgx->queues[i].rsp)
- rte_free(cgx->queues[i].rsp);
+ rte_free(cgx->queues[i].rsp);
}
cgx->num_queues = 0;
diff --git a/drivers/raw/dpaa2_qdma/dpaa2_qdma.c
b/drivers/raw/dpaa2_qdma/dpaa2_qdma.c
index ebc2cd5d0ddc..b2260439a4ef 100644
--- a/drivers/raw/dpaa2_qdma/dpaa2_qdma.c
+++ b/drivers/raw/dpaa2_qdma/dpaa2_qdma.c
@@ -1115,11 +1115,9 @@ dpaa2_qdma_reset(struct rte_rawdev *rawdev)
/* Reset and free virtual queues */
for (i = 0; i < qdma_dev->max_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 per core info */
@@ -1314,8 +1312,7 @@ dpaa2_qdma_queue_setup(struct rte_rawdev *rawdev,
if (qdma_dev->vqs[i].hw_queue == NULL) {
DPAA2_QDMA_ERR("No H/W queue available for VQ");
- 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);
qdma_dev->vqs[i].status_ring = NULL;
rte_spinlock_unlock(&qdma_dev->lock);
return -ENODEV;
@@ -1516,14 +1513,12 @@ dpaa2_qdma_queue_release(struct rte_rawdev *rawdev,
if (qdma_vq->exclusive_hw_queue)
free_hw_queue(qdma_vq->hw_queue);
else {
- if (qdma_vq->status_ring)
- rte_ring_free(qdma_vq->status_ring);
+ rte_ring_free(qdma_vq->status_ring);
put_hw_queue(qdma_vq->hw_queue);
}
- if (qdma_vq->fle_pool)
- rte_mempool_free(qdma_vq->fle_pool);
+ rte_mempool_free(qdma_vq->fle_pool);
memset(qdma_vq, 0, sizeof(struct qdma_virt_queue));
diff --git a/drivers/raw/ifpga/ifpga_rawdev.c b/drivers/raw/ifpga/ifpga_rawdev.c
index fdf3c23d2c5f..b73512d3ada5 100644
--- a/drivers/raw/ifpga/ifpga_rawdev.c
+++ b/drivers/raw/ifpga/ifpga_rawdev.c
@@ -836,8 +836,7 @@ rte_fpga_do_pr(struct rte_rawdev *rawdev, int port_id,
}
free_buffer:
- if (buf_to_free)
- rte_free(buf_to_free);
+ rte_free(buf_to_free);
close_fd:
close(file_fd);
file_fd = 0;
@@ -1739,10 +1738,8 @@ ifpga_cfg_probe(struct rte_vdev_device *dev)
ret = rte_eal_hotplug_add(RTE_STR(IFPGA_BUS_NAME),
dev_name, devargs->args);
end:
- if (kvlist)
- rte_kvargs_free(kvlist);
- if (name)
- free(name);
+ rte_kvargs_free(kvlist);
+ free(name);
return ret;
}
diff --git a/drivers/raw/skeleton/skeleton_rawdev_test.c
b/drivers/raw/skeleton/skeleton_rawdev_test.c
index 484468eeb460..693b24c415de 100644
--- a/drivers/raw/skeleton/skeleton_rawdev_test.c
+++ b/drivers/raw/skeleton/skeleton_rawdev_test.c
@@ -395,13 +395,11 @@ test_rawdev_enqdeq(void)
RTE_TEST_ASSERT_EQUAL((unsigned int)ret, count,
"Unable to dequeue buffers");
- if (deq_buffers)
- free(deq_buffers);
+ free(deq_buffers);
return TEST_SUCCESS;
cleanup:
- if (buffers[0].buf_addr)
- free(buffers[0].buf_addr);
+ free(buffers[0].buf_addr);
return TEST_FAILED;
}
--
2.34.1
