[dpdk-dev] [PATCH] net/enic: remove useless assert macro

[dpdk-dev] [PATCH] net/enic: remove useless assert macro

[Thomas Monjalon]

The macro ENIC_ASSERT does the same thing as RTE_ASSERT,
thus it can be removed.

Signed-off-by: Thomas Monjalon <thomas.monjalon@6wind.com>
---
 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);
-- 
2.7.0

Re: [dpdk-dev] [PATCH] net/enic: remove useless assert macro

[John Daley (johndale)]

> -----Original Message-----
> From: Thomas Monjalon [mailto:thomas.monjalon@6wind.com]
> Sent: Wednesday, July 06, 2016 8:25 AM
> To: John Daley (johndale) <johndale@cisco.com>; Nelson Escobar
> (neescoba) <neescoba@cisco.com>
> Cc: dev@dpdk.org
> Subject: [PATCH] net/enic: remove useless assert macro
> 
> The macro ENIC_ASSERT does the same thing as RTE_ASSERT, thus it can be
> removed.
> 
> Signed-off-by: Thomas Monjalon <thomas.monjalon@6wind.com>
Acked-by: John Daley <johndale@cisco.com>

Re: [dpdk-dev] [PATCH] net/enic: remove useless assert macro

[Thomas Monjalon]

> > The macro ENIC_ASSERT does the same thing as RTE_ASSERT, thus it can be
> > removed.
> > 
> > Signed-off-by: Thomas Monjalon <thomas.monjalon@6wind.com>
> Acked-by: John Daley <johndale@cisco.com>

Applied