Calling rte_free() with NULL parameter is allowed. Found by nullfree.cocci Fixes: 5964d36a2904 ("net/dpaa2: release port upon close") Cc: sachin.sax...@oss.nxp.com
Signed-off-by: Stephen Hemminger <step...@networkplumber.org> --- drivers/net/dpaa2/dpaa2_ethdev.c | 3 +-- drivers/net/dpaa2/dpaa2_flow.c | 27 +++++++++------------------ drivers/net/dpaa2/dpaa2_mux.c | 6 ++---- 3 files changed, 12 insertions(+), 24 deletions(-) diff --git a/drivers/net/dpaa2/dpaa2_ethdev.c b/drivers/net/dpaa2/dpaa2_ethdev.c index 8cbe481fb5..a9bce854c3 100644 --- a/drivers/net/dpaa2/dpaa2_ethdev.c +++ b/drivers/net/dpaa2/dpaa2_ethdev.c @@ -1401,8 +1401,7 @@ dpaa2_dev_close(struct rte_eth_dev *dev) for (i = 0; i < MAX_TCS; i++) rte_free(priv->extract.tc_extract_param[i]); - if (priv->extract.qos_extract_param) - rte_free(priv->extract.qos_extract_param); + rte_free(priv->extract.qos_extract_param); DPAA2_PMD_INFO("%s: netdev deleted", dev->data->name); return 0; diff --git a/drivers/net/dpaa2/dpaa2_flow.c b/drivers/net/dpaa2/dpaa2_flow.c index de850ae0cf..c94eb51ba5 100644 --- a/drivers/net/dpaa2/dpaa2_flow.c +++ b/drivers/net/dpaa2/dpaa2_flow.c @@ -4784,8 +4784,7 @@ dpaa2_generic_flow_set(struct dpaa2_dev_flow *flow, } } - if (dpaa2_pattern) - rte_free(dpaa2_pattern); + rte_free(dpaa2_pattern); return ret; } @@ -5057,14 +5056,10 @@ dpaa2_flow_create(struct rte_eth_dev *dev, const struct rte_flow_attr *attr, creation_error: if (flow) { - if (flow->qos_key_addr) - rte_free(flow->qos_key_addr); - if (flow->qos_mask_addr) - rte_free(flow->qos_mask_addr); - if (flow->fs_key_addr) - rte_free(flow->fs_key_addr); - if (flow->fs_mask_addr) - rte_free(flow->fs_mask_addr); + rte_free(flow->qos_key_addr); + rte_free(flow->qos_mask_addr); + rte_free(flow->fs_key_addr); + rte_free(flow->fs_mask_addr); rte_free(flow); } priv->curr = NULL; @@ -5128,14 +5123,10 @@ dpaa2_flow_destroy(struct rte_eth_dev *dev, struct rte_flow *_flow, } LIST_REMOVE(flow, next); - if (flow->qos_key_addr) - rte_free(flow->qos_key_addr); - if (flow->qos_mask_addr) - rte_free(flow->qos_mask_addr); - if (flow->fs_key_addr) - rte_free(flow->fs_key_addr); - if (flow->fs_mask_addr) - rte_free(flow->fs_mask_addr); + rte_free(flow->qos_key_addr); + rte_free(flow->qos_mask_addr); + rte_free(flow->fs_key_addr); + rte_free(flow->fs_mask_addr); /* Now free the flow */ rte_free(flow); diff --git a/drivers/net/dpaa2/dpaa2_mux.c b/drivers/net/dpaa2/dpaa2_mux.c index e9d48a81a8..2f124313fa 100644 --- a/drivers/net/dpaa2/dpaa2_mux.c +++ b/drivers/net/dpaa2/dpaa2_mux.c @@ -329,10 +329,8 @@ rte_pmd_dpaa2_mux_flow_create(uint32_t dpdmux_id, } creation_error: - if (key_cfg_va) - rte_free(key_cfg_va); - if (key_va) - rte_free(key_va); + rte_free(key_cfg_va); + rte_free(key_va); return ret; } -- 2.45.2