From patchwork Wed Jul 6 15:25:28 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Monjalon X-Patchwork-Id: 14608 X-Patchwork-Delegate: bruce.richardson@intel.com 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 B77808D37; Wed, 6 Jul 2016 17:25:39 +0200 (CEST) Received: from mail-wm0-f45.google.com (mail-wm0-f45.google.com [74.125.82.45]) by dpdk.org (Postfix) with ESMTP id 1DBC36CCF for ; Wed, 6 Jul 2016 17:25:38 +0200 (CEST) Received: by mail-wm0-f45.google.com with SMTP id r201so197448279wme.1 for ; Wed, 06 Jul 2016 08:25:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6wind-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=upusyoUOGrcdKV68BZWtqUk1eH8Y0zxytdfP+r0KZi4=; b=SI7DqxNDi5WkI7rmXnsBa8rKAwH+6l/GI/4PLvZ23eTkX8N5rtlKbiab34WVfxW845 P50C0gEkt5vBBLWtCbBsnUX5QGNqFer/yazzhDbkfznFAsKksIKfmT5ivsC36O7T+imw 10+JQA4aukvtE4kMagi83yeLogaQHOVaDnWKnKsvlFCnF0JSRMORfWA2vpB0MFqvSsEe 1+Gy+76ANUJjIh1mz8hiP0HRph9unOFOIcFXVjnPe6jclT3875NFMEz4Jfc2NVLPfj6W Z/9eFzpJMFJ+hZFtFkU1djhul/5Akg9+WkBht5tfZwSeC2p7hh8EeG8dSsV912CRtL07 myug== 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; bh=upusyoUOGrcdKV68BZWtqUk1eH8Y0zxytdfP+r0KZi4=; b=NedDWGGc6bTQdnchrDV8FlhrpcViH5NUaHaGE5so2qTp8T4Bmqr32IT0MzxavApoJQ 9ZEYB+37My+L39+wHRmbfetqODsQcp+rU1pzA15yofqezPFPtWLpY1Jirc/USNWyZgn+ Vo8vSItQAUaFSnHPQxgsyalefRYW4is9E2AdGWIc4cPIPa5lf2hvLjsjs+gEyMTzFeTW 4k4KRTEF+06b2IMqzXb8gIJ6fT80PKa6014dRHy17KHyHMaWo5fk0VGrTl9qayvRLKyI FZ9tlQdsbNrq8vtG1SQaYI58FttGZapSgHptBJy8JdEZHYIa+k2d9OQs1FVCK8fIzUTA DQsQ== X-Gm-Message-State: ALyK8tJfhHx8Ep8qGTRkmL/4bHmzkX2ayLDeaAS8CBjoLBAeRidEBIT57X+kJf50e4Wgi+sr X-Received: by 10.194.191.195 with SMTP id ha3mr18562689wjc.74.1467818737923; Wed, 06 Jul 2016 08:25:37 -0700 (PDT) Received: from XPS13.localdomain (184.203.134.77.rev.sfr.net. [77.134.203.184]) by smtp.gmail.com with ESMTPSA id o10sm4286273wjs.38.2016.07.06.08.25.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 06 Jul 2016 08:25:37 -0700 (PDT) From: Thomas Monjalon To: John Daley , Nelson Escobar Cc: dev@dpdk.org Date: Wed, 6 Jul 2016 17:25:28 +0200 Message-Id: <1467818728-28741-1-git-send-email-thomas.monjalon@6wind.com> X-Mailer: git-send-email 2.7.0 Subject: [dpdk-dev] [PATCH] net/enic: remove useless assert macro 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" The macro ENIC_ASSERT does the same thing as RTE_ASSERT, thus it can be removed. Signed-off-by: Thomas Monjalon Acked-by: John Daley --- drivers/net/enic/enic.h | 12 ------------ drivers/net/enic/enic_rxtx.c | 2 +- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/drivers/net/enic/enic.h b/drivers/net/enic/enic.h index 53fed0b..191e1a3 100644 --- a/drivers/net/enic/enic.h +++ b/drivers/net/enic/enic.h @@ -221,18 +221,6 @@ enic_ring_incr(uint32_t n_descriptors, uint32_t idx) return idx; } -#if RTE_LOG_LEVEL >= RTE_LOG_DEBUG -#define ENIC_ASSERT(cond) \ - do { \ - if (unlikely(!(cond))) { \ - rte_panic("line %d\tassert \"" #cond "\"" \ - "failed\n", __LINE__); \ - } \ - } while (0) -#else -#define ENIC_ASSERT(cond) do {} while (0) -#endif - extern void enic_fdir_stats_get(struct enic *enic, struct rte_eth_fdir_stats *stats); extern int enic_fdir_add_fltr(struct enic *enic, diff --git a/drivers/net/enic/enic_rxtx.c b/drivers/net/enic/enic_rxtx.c index 5ac1d69..2f4a08c 100644 --- a/drivers/net/enic/enic_rxtx.c +++ b/drivers/net/enic/enic_rxtx.c @@ -400,7 +400,7 @@ static inline void enic_free_wq_bufs(struct vnic_wq *wq, u16 completed_index) buf = &wq->bufs[tail_idx]; m = (struct rte_mbuf *)(buf->mb); if (likely(m->pool == pool)) { - ENIC_ASSERT(nb_free < ENIC_MAX_WQ_DESCS); + RTE_ASSERT(nb_free < ENIC_MAX_WQ_DESCS); free[nb_free++] = m; } else { rte_mempool_put_bulk(pool, (void *)free, nb_free);