Remove redundant NULL pointer checks before free functions
found by nullfree.cocci
Signed-off-by: Stephen Hemminger <step...@networkplumber.org>
---
drivers/common/cpt/cpt_ucode_asym.h | 6 ++----
drivers/common/dpaax/compat.h | 11 ++---------
drivers/common/mlx5/mlx5_common_mr.c | 3 +--
drivers/common/mlx5/mlx5_common_pci.c | 3 +--
drivers/common/qat/qat_qp.c | 9 +++------
5 files changed, 9 insertions(+), 23 deletions(-)
diff --git a/drivers/common/cpt/cpt_ucode_asym.h
b/drivers/common/cpt/cpt_ucode_asym.h
index f0b5dddd8cdf..f5d91f2583bd 100644
--- a/drivers/common/cpt/cpt_ucode_asym.h
+++ b/drivers/common/cpt/cpt_ucode_asym.h
@@ -192,13 +192,11 @@ cpt_free_asym_session_parameters(struct
cpt_asym_sess_misc *sess)
switch (sess->xfrm_type) {
case RTE_CRYPTO_ASYM_XFORM_RSA:
rsa = &sess->rsa_ctx;
- if (rsa->n.data)
- rte_free(rsa->n.data);
+ rte_free(rsa->n.data);
break;
case RTE_CRYPTO_ASYM_XFORM_MODEX:
mod = &sess->mod_ctx;
- if (mod->modulus.data)
- rte_free(mod->modulus.data);
+ rte_free(mod->modulus.data);
break;
case RTE_CRYPTO_ASYM_XFORM_ECDSA:
/* Fall through */
diff --git a/drivers/common/dpaax/compat.h b/drivers/common/dpaax/compat.h
index 7166f8cceb41..cbabc1588b21 100644
--- a/drivers/common/dpaax/compat.h
+++ b/drivers/common/dpaax/compat.h
@@ -339,16 +339,9 @@ static inline void copy_bytes(void *dest, const void *src,
size_t sz)
/* Allocator stuff */
#define kmalloc(sz, t) rte_malloc(NULL, sz, 0)
+#define kzalloc(sz, t) rte_zmalloc(NULL, sz, 0)
#define vmalloc(sz) rte_malloc(NULL, sz, 0)
-#define kfree(p) { if (p) rte_free(p); }
-static inline void *kzalloc(size_t sz, gfp_t __foo __rte_unused)
-{
- void *ptr = rte_malloc(NULL, sz, 0);
-
- if (ptr)
- memset(ptr, 0, sz);
- return ptr;
-}
+#define kfree(p) rte_free(p)
static inline unsigned long get_zeroed_page(gfp_t __foo __rte_unused)
{
diff --git a/drivers/common/mlx5/mlx5_common_mr.c
b/drivers/common/mlx5/mlx5_common_mr.c
index 5f7e4f6734aa..fa27bd98de04 100644
--- a/drivers/common/mlx5/mlx5_common_mr.c
+++ b/drivers/common/mlx5/mlx5_common_mr.c
@@ -516,8 +516,7 @@ mlx5_mr_free(struct mlx5_mr *mr, mlx5_dereg_mr_t
dereg_mr_cb)
return;
DRV_LOG(DEBUG, "freeing MR(%p):", (void *)mr);
dereg_mr_cb(&mr->pmd_mr);
- if (mr->ms_bmp != NULL)
- rte_bitmap_free(mr->ms_bmp);
+ rte_bitmap_free(mr->ms_bmp);
mlx5_free(mr);
}
diff --git a/drivers/common/mlx5/mlx5_common_pci.c
b/drivers/common/mlx5/mlx5_common_pci.c
index 8b38091d8741..458630351cd1 100644
--- a/drivers/common/mlx5/mlx5_common_pci.c
+++ b/drivers/common/mlx5/mlx5_common_pci.c
@@ -97,8 +97,7 @@ pci_ids_table_update(const struct rte_pci_id *driver_id_table)
updated_table[i].vendor_id = 0;
mlx5_common_pci_driver.id_table = updated_table;
mlx5_pci_id_table = updated_table;
- if (old_table)
- free(old_table);
+ free(old_table);
return 0;
}
diff --git a/drivers/common/qat/qat_qp.c b/drivers/common/qat/qat_qp.c
index cde421eb7716..57ac8fefca3d 100644
--- a/drivers/common/qat/qat_qp.c
+++ b/drivers/common/qat/qat_qp.c
@@ -175,11 +175,9 @@ qat_qp_setup(struct qat_pci_device *qat_dev,
create_err:
if (qp) {
- if (qp->op_cookie_pool)
- rte_mempool_free(qp->op_cookie_pool);
+ rte_mempool_free(qp->op_cookie_pool);
- if (qp->op_cookies)
- rte_free(qp->op_cookies);
+ rte_free(qp->op_cookies);
rte_free(qp);
}
@@ -329,8 +327,7 @@ qat_qp_release(enum qat_device_gen qat_dev_gen, struct
qat_qp **qp_addr)
for (i = 0; i < qp->nb_descriptors; i++)
rte_mempool_put(qp->op_cookie_pool, qp->op_cookies[i]);
- if (qp->op_cookie_pool)
- rte_mempool_free(qp->op_cookie_pool);
+ rte_mempool_free(qp->op_cookie_pool);
rte_free(qp->op_cookies);
rte_free(qp);
--
2.34.1
