From patchwork Tue Apr 7 21:21:01 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 4256 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id 8A9AC5A53; Tue, 7 Apr 2015 23:21:07 +0200 (CEST) Received: from mail-pa0-f52.google.com (mail-pa0-f52.google.com [209.85.220.52]) by dpdk.org (Postfix) with ESMTP id A6F1A58DD for ; Tue, 7 Apr 2015 23:21:05 +0200 (CEST) Received: by patj18 with SMTP id j18so91390212pat.2 for ; Tue, 07 Apr 2015 14:21:05 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=BznafK2IxzgIPsaHAGacdD0d/716NkYvPgT7+XQHkn0=; b=DWli2Iqqjg0QSxOS2nJAjSF8uBhK8SCt1tWfFAmvtQ2uDGNVdWMhtTlxeKfGpdaORt 64pXeMrGKYE8mWYUGm5kjnZPLr8nuYss6IZY+hg+p///shStqDhO+cxyJxeJI3TXqkxu JWi4muYX3rl2+1KtiplUMeOmg6awrFhIN+YpVGh2RqihRTwvy9EyvSb4Pb0qfwNA9+ZC a6uxVOtXxZNIVAEn7jjegjxOjeFuQ+I2oJXsfQ1igi30S2LoJnEKlCpKiL3byCJ6SXHe okCgvM/0gFLoy33x1NwMBy1wA3n3Y8CIEDao0PNQvWzVbJZfwxO/s/LxDFgzhtNm4HTX noGQ== X-Gm-Message-State: ALoCoQlv2hhxXbbhdIkiGgTmXNRc7dfbwgrKrjNuFubyxG1v+sDrghQbIyPH1AN+2X1Z829c+Mc/ X-Received: by 10.66.102.65 with SMTP id fm1mr40051867pab.115.1428441665049; Tue, 07 Apr 2015 14:21:05 -0700 (PDT) Received: from urahara.brocade.com (static-50-53-82-155.bvtn.or.frontiernet.net. [50.53.82.155]) by mx.google.com with ESMTPSA id j2sm9020328pdn.44.2015.04.07.14.21.04 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 07 Apr 2015 14:21:04 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Date: Tue, 7 Apr 2015 14:21:01 -0700 Message-Id: <1428441663-3825-4-git-send-email-stephen@networkplumber.org> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1428441663-3825-1-git-send-email-stephen@networkplumber.org> References: <1428441663-3825-1-git-send-email-stephen@networkplumber.org> Subject: [dpdk-dev] [PATCH v2 4/6] pmd: remove unnecessary if() before rte_free X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Since rte_free accept NULL and does nothing, better to save space and remove these useless checks. Signed-off-by: Stephen Hemminger --- lib/librte_pmd_af_packet/rte_eth_af_packet.c | 14 ++++++-------- lib/librte_pmd_bond/rte_eth_bond_api.c | 13 +++++-------- lib/librte_pmd_enic/enic_main.c | 3 +-- lib/librte_pmd_mlx4/mlx4.c | 15 +++++++-------- lib/librte_pmd_null/rte_eth_null.c | 13 +++++-------- lib/librte_pmd_pcap/rte_eth_pcap.c | 11 +++++------ lib/librte_pmd_ring/rte_eth_ring.c | 10 ++++------ lib/librte_pmd_xenvirt/rte_eth_xenvirt.c | 10 ++++------ 8 files changed, 37 insertions(+), 52 deletions(-) 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 2ac50ba..c10da6c 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 13f3941..f594fe1 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 0892b3e..0e40d46 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 fa749f4..0eca322 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 0e18502..036faaf 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 204ae68..3a7db98 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 1e66d4e..199e15f 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 bc403d6..edf2a5f 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; }