[2/4] ml/cnkx: remove unnecessary null checks
Checks
Commit Message
These are places where null check is not necessary before
calling free.
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
drivers/ml/cnxk/cn10k_ml_dev.c | 9 +++------
drivers/ml/cnxk/cn10k_ml_ops.c | 12 ++++--------
2 files changed, 7 insertions(+), 14 deletions(-)
Comments
> -----Original Message-----
> From: Stephen Hemminger <stephen@networkplumber.org>
> Sent: 23 March 2023 06:34
> To: dev@dpdk.org
> Cc: Stephen Hemminger <stephen@networkplumber.org>; Srikanth
> Yalavarthi <syalavarthi@marvell.com>; Srikanth Yalavarthi
> <syalavarthi@marvell.com>
> Subject: [EXT] [PATCH 2/4] ml/cnkx: remove unnecessary null checks
>
> External Email
>
> ----------------------------------------------------------------------
> These are places where null check is not necessary before calling free.
>
> Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Acked-by: Srikanth Yalavarthi <syalavarthi@marvell.com>
@@ -319,8 +319,7 @@ cn10k_mldev_parse_devargs(struct rte_devargs *devargs, struct cn10k_ml_dev *mlde
plt_info("ML: %s = %d", CN10K_ML_OCM_PAGE_SIZE, mldev->ocm_page_size);
exit:
- if (kvlist)
- rte_kvargs_free(kvlist);
+ rte_kvargs_free(kvlist);
return ret;
}
@@ -795,8 +794,7 @@ cn10k_ml_fw_load(struct cn10k_ml_dev *mldev)
mz = plt_memzone_reserve_aligned(FW_MEMZONE_NAME, mz_size, 0, ML_CN10K_ALIGN_SIZE);
if (mz == NULL) {
plt_err("plt_memzone_reserve failed : %s", FW_MEMZONE_NAME);
- if (fw_buffer != NULL)
- free(fw_buffer);
+ free(fw_buffer);
return -ENOMEM;
}
fw->req = mz->addr;
@@ -813,8 +811,7 @@ cn10k_ml_fw_load(struct cn10k_ml_dev *mldev)
if (roc_env_is_emulator() || roc_env_is_hw()) {
fw->data = PLT_PTR_ADD(mz->addr, sizeof(struct cn10k_ml_req));
ret = cn10k_ml_fw_load_cn10ka(fw, fw_buffer, fw_size);
- if (fw_buffer != NULL)
- free(fw_buffer);
+ free(fw_buffer);
} else if (roc_env_is_asim()) {
fw->data = NULL;
ret = cn10k_ml_fw_load_asim(fw);
@@ -845,11 +845,9 @@ cn10k_ml_dev_configure(struct rte_ml_dev *dev, const struct rte_ml_dev_config *c
return 0;
error:
- if (dev->data->queue_pairs != NULL)
- rte_free(dev->data->queue_pairs);
+ rte_free(dev->data->queue_pairs);
- if (dev->data->models != NULL)
- rte_free(dev->data->models);
+ rte_free(dev->data->models);
return ret;
}
@@ -887,8 +885,7 @@ cn10k_ml_dev_close(struct rte_ml_dev *dev)
}
}
- if (dev->data->models)
- rte_free(dev->data->models);
+ rte_free(dev->data->models);
/* Destroy all queue pairs */
for (qp_id = 0; qp_id < dev->data->nb_queue_pairs; qp_id++) {
@@ -900,8 +897,7 @@ cn10k_ml_dev_close(struct rte_ml_dev *dev)
}
}
- if (dev->data->queue_pairs)
- rte_free(dev->data->queue_pairs);
+ rte_free(dev->data->queue_pairs);
/* Unload firmware */
cn10k_ml_fw_unload(mldev);