Remove redundant NULL pointer checks before free functions
found by nullfree.cocci
Signed-off-by: Stephen Hemminger <step...@networkplumber.org>
Acked-by: Min Hu (Connor) <humi...@huawei.com>
---
drivers/net/bonding/rte_eth_bond_pmd.c | 3 +--
drivers/net/memif/rte_eth_memif.c | 6 ++----
drivers/net/null/rte_eth_null.c | 3 +--
drivers/net/softnic/rte_eth_softnic_cli.c | 12 ++++--------
drivers/net/softnic/rte_eth_softnic_cryptodev.c | 6 ++----
drivers/net/softnic/rte_eth_softnic_thread.c | 6 ++----
drivers/net/tap/tap_flow.c | 9 +++------
7 files changed, 15 insertions(+), 30 deletions(-)
diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c
b/drivers/net/bonding/rte_eth_bond_pmd.c
index c72fc64806cf..0289f882fdb5 100644
--- a/drivers/net/bonding/rte_eth_bond_pmd.c
+++ b/drivers/net/bonding/rte_eth_bond_pmd.c
@@ -2155,8 +2155,7 @@ bond_ethdev_close(struct rte_eth_dev *dev)
*/
rte_mempool_free(internals->mode6.mempool);
- if (internals->kvlist != NULL)
- rte_kvargs_free(internals->kvlist);
+ rte_kvargs_free(internals->kvlist);
return 0;
}
diff --git a/drivers/net/memif/rte_eth_memif.c
b/drivers/net/memif/rte_eth_memif.c
index d3459c5007c4..cca07cd84d50 100644
--- a/drivers/net/memif/rte_eth_memif.c
+++ b/drivers/net/memif/rte_eth_memif.c
@@ -1712,8 +1712,7 @@ memif_check_socket_filename(const char *filename)
ret = -EINVAL;
}
- if (dir != NULL)
- rte_free(dir);
+ rte_free(dir);
return ret;
}
@@ -1884,8 +1883,7 @@ rte_pmd_memif_probe(struct rte_vdev_device *vdev)
log2_ring_size, pkt_buffer_size, secret, ether_addr);
exit:
- if (kvlist != NULL)
- rte_kvargs_free(kvlist);
+ rte_kvargs_free(kvlist);
return ret;
}
diff --git a/drivers/net/null/rte_eth_null.c b/drivers/net/null/rte_eth_null.c
index ca03469d0e6d..bb89c1abc4a2 100644
--- a/drivers/net/null/rte_eth_null.c
+++ b/drivers/net/null/rte_eth_null.c
@@ -717,8 +717,7 @@ rte_pmd_null_probe(struct rte_vdev_device *dev)
ret = eth_dev_null_create(dev, &args);
free_kvlist:
- if (kvlist)
- rte_kvargs_free(kvlist);
+ rte_kvargs_free(kvlist);
return ret;
}
diff --git a/drivers/net/softnic/rte_eth_softnic_cli.c
b/drivers/net/softnic/rte_eth_softnic_cli.c
index b04e78c6e0af..7acbeecae7a2 100644
--- a/drivers/net/softnic/rte_eth_softnic_cli.c
+++ b/drivers/net/softnic/rte_eth_softnic_cli.c
@@ -4482,10 +4482,8 @@ parse_free_sym_crypto_param_data(struct
rte_table_action_sym_crypto_params *p)
switch (xform[i]->type) {
case RTE_CRYPTO_SYM_XFORM_CIPHER:
- if (p->cipher_auth.cipher_iv.val)
- free(p->cipher_auth.cipher_iv.val);
- if (p->cipher_auth.cipher_iv_update.val)
- free(p->cipher_auth.cipher_iv_update.val);
+ free(p->cipher_auth.cipher_iv.val);
+ free(p->cipher_auth.cipher_iv_update.val);
break;
case RTE_CRYPTO_SYM_XFORM_AUTH:
if (p->cipher_auth.auth_iv.val)
@@ -4494,10 +4492,8 @@ parse_free_sym_crypto_param_data(struct
rte_table_action_sym_crypto_params *p)
free(p->cipher_auth.cipher_iv_update.val);
break;
case RTE_CRYPTO_SYM_XFORM_AEAD:
- if (p->aead.iv.val)
- free(p->aead.iv.val);
- if (p->aead.aad.val)
- free(p->aead.aad.val);
+ free(p->aead.iv.val);
+ free(p->aead.aad.val);
break;
default:
continue;
diff --git a/drivers/net/softnic/rte_eth_softnic_cryptodev.c
b/drivers/net/softnic/rte_eth_softnic_cryptodev.c
index 9a7d006f1a09..e4754055e90b 100644
--- a/drivers/net/softnic/rte_eth_softnic_cryptodev.c
+++ b/drivers/net/softnic/rte_eth_softnic_cryptodev.c
@@ -159,10 +159,8 @@ softnic_cryptodev_create(struct pmd_internals *p,
return cryptodev;
error_exit:
- if (cryptodev->mp_create)
- rte_mempool_free(cryptodev->mp_create);
- if (cryptodev->mp_init)
- rte_mempool_free(cryptodev->mp_init);
+ rte_mempool_free(cryptodev->mp_create);
+ rte_mempool_free(cryptodev->mp_init);
free(cryptodev);
diff --git a/drivers/net/softnic/rte_eth_softnic_thread.c
b/drivers/net/softnic/rte_eth_softnic_thread.c
index a8c26a5b2377..1b3b3c33c175 100644
--- a/drivers/net/softnic/rte_eth_softnic_thread.c
+++ b/drivers/net/softnic/rte_eth_softnic_thread.c
@@ -29,11 +29,9 @@ softnic_thread_free(struct pmd_internals *softnic)
struct softnic_thread *t = &softnic->thread[i];
/* MSGQs */
- if (t->msgq_req)
- rte_ring_free(t->msgq_req);
+ rte_ring_free(t->msgq_req);
- if (t->msgq_rsp)
- rte_ring_free(t->msgq_rsp);
+ rte_ring_free(t->msgq_rsp);
}
}
diff --git a/drivers/net/tap/tap_flow.c b/drivers/net/tap/tap_flow.c
index 76738239458a..a9a55e439efc 100644
--- a/drivers/net/tap/tap_flow.c
+++ b/drivers/net/tap/tap_flow.c
@@ -1465,8 +1465,7 @@ tap_flow_create(struct rte_eth_dev *dev,
}
return flow;
fail:
- if (remote_flow)
- rte_free(remote_flow);
+ rte_free(remote_flow);
if (flow)
tap_flow_free(pmd, flow);
return NULL;
@@ -1541,8 +1540,7 @@ tap_flow_destroy_pmd(struct pmd_internals *pmd,
}
}
end:
- if (remote_flow)
- rte_free(remote_flow);
+ rte_free(remote_flow);
tap_flow_free(pmd, flow);
return ret;
}
@@ -1764,8 +1762,7 @@ int tap_flow_implicit_create(struct pmd_internals *pmd,
success:
return 0;
fail:
- if (remote_flow)
- rte_free(remote_flow);
+ rte_free(remote_flow);
return -1;
}
--
2.34.1
