From: Stephen Hemminger Date: Tue, 7 Apr 2015 21:21:01 +0000 (-0700) Subject: pmd: remove useless null checks before rte_free X-Git-Tag: spdx-start~9319 X-Git-Url: http://git.droids-corp.org/?a=commitdiff_plain;h=80d8c6a5bb0893b7484f869f802b08697b2b6769;p=dpdk.git pmd: remove useless null checks before rte_free Since rte_free accept NULL and does nothing, better to save space and remove these useless checks. Signed-off-by: Stephen Hemminger Acked-by: Neil Horman --- diff --git a/lib/librte_pmd_af_packet/rte_eth_af_packet.c b/lib/librte_pmd_af_packet/rte_eth_af_packet.c index 2ac50ba313..c10da6c4d1 100644 --- a/lib/librte_pmd_af_packet/rte_eth_af_packet.c +++ b/lib/librte_pmd_af_packet/rte_eth_af_packet.c @@ -680,18 +680,16 @@ rte_pmd_init_internals(const char *name, return 0; error: - if (data) - rte_free(data); - if (pci_dev) - rte_free(pci_dev); + rte_free(data); + rte_free(pci_dev); + if (*internals) { for (q = 0; q < nb_queues; q++) { munmap((*internals)->rx_queue[q].map, 2 * req->tp_block_size * req->tp_block_nr); - if ((*internals)->rx_queue[q].rd) - rte_free((*internals)->rx_queue[q].rd); - if ((*internals)->tx_queue[q].rd) - rte_free((*internals)->tx_queue[q].rd); + + rte_free((*internals)->rx_queue[q].rd); + rte_free((*internals)->tx_queue[q].rd); if (((*internals)->rx_queue[q].sockfd != 0) && ((*internals)->rx_queue[q].sockfd != qsockfd)) close((*internals)->rx_queue[q].sockfd); diff --git a/lib/librte_pmd_bond/rte_eth_bond_api.c b/lib/librte_pmd_bond/rte_eth_bond_api.c index 13f39417ea..f594fe153b 100644 --- a/lib/librte_pmd_bond/rte_eth_bond_api.c +++ b/lib/librte_pmd_bond/rte_eth_bond_api.c @@ -318,14 +318,11 @@ rte_eth_bond_create(const char *name, uint8_t mode, uint8_t socket_id) return eth_dev->data->port_id; err: - if (pci_dev) - rte_free(pci_dev); - if (pci_id_table) - rte_free(pci_id_table); - if (eth_drv) - rte_free(eth_drv); - if (internals) - rte_free(internals); + rte_free(pci_dev); + rte_free(pci_id_table); + rte_free(eth_drv); + rte_free(internals); + return -1; } diff --git a/lib/librte_pmd_enic/enic_main.c b/lib/librte_pmd_enic/enic_main.c index 0892b3e2b2..0e40d4665d 100644 --- a/lib/librte_pmd_enic/enic_main.c +++ b/lib/librte_pmd_enic/enic_main.c @@ -983,8 +983,7 @@ static void enic_dev_deinit(struct enic *enic) { struct rte_eth_dev *eth_dev = enic->rte_dev; - if (eth_dev->data->mac_addrs) - rte_free(eth_dev->data->mac_addrs); + rte_free(eth_dev->data->mac_addrs); } diff --git a/lib/librte_pmd_mlx4/mlx4.c b/lib/librte_pmd_mlx4/mlx4.c index fa749f4541..0eca322d5d 100644 --- a/lib/librte_pmd_mlx4/mlx4.c +++ b/lib/librte_pmd_mlx4/mlx4.c @@ -792,10 +792,10 @@ txq_alloc_elts(struct txq *txq, unsigned int elts_n) error: if (mr_linear != NULL) claim_zero(ibv_dereg_mr(mr_linear)); - if (elts_linear != NULL) - rte_free(elts_linear); - if (elts != NULL) - rte_free(elts); + + rte_free(elts_linear); + rte_free(elts); + DEBUG("%p: failed, freed everything", (void *)txq); assert(ret > 0); return ret; @@ -823,8 +823,8 @@ txq_free_elts(struct txq *txq) txq->mr_linear = NULL; if (mr_linear != NULL) claim_zero(ibv_dereg_mr(mr_linear)); - if (elts_linear != NULL) - rte_free(elts_linear); + + rte_free(elts_linear); if (elts == NULL) return; for (i = 0; (i != elemof(*elts)); ++i) { @@ -4602,8 +4602,7 @@ mlx4_pci_devinit(struct rte_pci_driver *pci_drv, struct rte_pci_device *pci_dev) continue; port_error: - if (priv) - rte_free(priv); + rte_free(priv); if (pd) claim_zero(ibv_dealloc_pd(pd)); if (ctx) diff --git a/lib/librte_pmd_null/rte_eth_null.c b/lib/librte_pmd_null/rte_eth_null.c index 0e18502704..036faafaeb 100644 --- a/lib/librte_pmd_null/rte_eth_null.c +++ b/lib/librte_pmd_null/rte_eth_null.c @@ -355,8 +355,7 @@ eth_queue_release(void *q) return; nq = q; - if (nq->dummy_packet) - rte_free(nq->dummy_packet); + rte_free(nq->dummy_packet); } static int @@ -458,12 +457,10 @@ eth_dev_null_create(const char *name, return 0; error: - if (data) - rte_free(data); - if (pci_dev) - rte_free(pci_dev); - if (internals) - rte_free(internals); + rte_free(data); + rte_free(pci_dev); + rte_free(internals); + return -1; } diff --git a/lib/librte_pmd_pcap/rte_eth_pcap.c b/lib/librte_pmd_pcap/rte_eth_pcap.c index 204ae6825a..3a7db98d04 100644 --- a/lib/librte_pmd_pcap/rte_eth_pcap.c +++ b/lib/librte_pmd_pcap/rte_eth_pcap.c @@ -760,12 +760,11 @@ rte_pmd_init_internals(const char *name, const unsigned nb_rx_queues, return 0; - error: if (data) - rte_free(data); - if (pci_dev) - rte_free(pci_dev); - if (*internals) - rte_free(*internals); +error: + rte_free(data); + rte_free(pci_dev); + rte_free(*internals); + return -1; } diff --git a/lib/librte_pmd_ring/rte_eth_ring.c b/lib/librte_pmd_ring/rte_eth_ring.c index 1e66d4ec19..199e15fcbf 100644 --- a/lib/librte_pmd_ring/rte_eth_ring.c +++ b/lib/librte_pmd_ring/rte_eth_ring.c @@ -349,12 +349,10 @@ rte_eth_from_rings(const char *name, struct rte_ring *const rx_queues[], return 0; error: - if (data) - rte_free(data); - if (pci_dev) - rte_free(pci_dev); - if (internals) - rte_free(internals); + rte_free(data); + rte_free(pci_dev); + rte_free(internals); + return -1; } diff --git a/lib/librte_pmd_xenvirt/rte_eth_xenvirt.c b/lib/librte_pmd_xenvirt/rte_eth_xenvirt.c index bc403d60b7..edf2a5fa69 100644 --- a/lib/librte_pmd_xenvirt/rte_eth_xenvirt.c +++ b/lib/librte_pmd_xenvirt/rte_eth_xenvirt.c @@ -679,12 +679,10 @@ eth_dev_xenvirt_create(const char *name, const char *params, return 0; err: - if (data) - rte_free(data); - if (pci_dev) - rte_free(pci_dev); - if (internals) - rte_free(internals); + rte_free(data); + rte_free(pci_dev); + rte_free(internals); + return -1; }