[PATCH 5/8] net/nfp: remove the custom round macro

[Chaoyong He]

Remove the custom round macro, use the macro provide by
the DPDK.

Signed-off-by: Chaoyong He <chaoyong.he at corigine.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund at corigine.com>
---
 drivers/net/nfp/nfdk/nfp_nfdk_dp.c  |  9 +++++----
 drivers/net/nfp/nfpcore/nfp_rtsym.c |  4 ++--
 drivers/net/nfp/nfpcore/nfp_rtsym.h | 19 -------------------
 3 files changed, 7 insertions(+), 25 deletions(-)

diff --git a/drivers/net/nfp/nfdk/nfp_nfdk_dp.c b/drivers/net/nfp/nfdk/nfp_nfdk_dp.c
index b35aa9a610..9b815800bb 100644
--- a/drivers/net/nfp/nfdk/nfp_nfdk_dp.c
+++ b/drivers/net/nfp/nfdk/nfp_nfdk_dp.c
@@ -70,8 +70,8 @@ nfp_net_nfdk_tx_maybe_close_block(struct nfp_net_txq *txq,
 		n_descs++;
 
 	/* Don't count metadata descriptor, for the round down to work out */
-	if (round_down(txq->wr_p, NFDK_TX_DESC_BLOCK_CNT) !=
-			round_down(txq->wr_p + n_descs, NFDK_TX_DESC_BLOCK_CNT))
+	if (RTE_ALIGN_FLOOR(txq->wr_p, NFDK_TX_DESC_BLOCK_CNT) !=
+			RTE_ALIGN_FLOOR(txq->wr_p + n_descs, NFDK_TX_DESC_BLOCK_CNT))
 		goto close_block;
 
 	if (txq->data_pending + pkt->pkt_len > NFDK_TX_MAX_DATA_PER_BLOCK)
@@ -293,8 +293,9 @@ nfp_net_nfdk_xmit_pkts(void *tx_queue,
 		}
 
 		used_descs = ktxds - txq->ktxds - txq->wr_p;
-		if (round_down(txq->wr_p, NFDK_TX_DESC_BLOCK_CNT) !=
-				round_down(txq->wr_p + used_descs - 1, NFDK_TX_DESC_BLOCK_CNT)) {
+		if (RTE_ALIGN_FLOOR(txq->wr_p, NFDK_TX_DESC_BLOCK_CNT) !=
+				RTE_ALIGN_FLOOR(txq->wr_p + used_descs - 1,
+						NFDK_TX_DESC_BLOCK_CNT)) {
 			PMD_TX_LOG(INFO, "Used descs cross block boundary");
 			goto xmit_end;
 		}
diff --git a/drivers/net/nfp/nfpcore/nfp_rtsym.c b/drivers/net/nfp/nfpcore/nfp_rtsym.c
index 850667adf8..9713605580 100644
--- a/drivers/net/nfp/nfpcore/nfp_rtsym.c
+++ b/drivers/net/nfp/nfpcore/nfp_rtsym.c
@@ -113,8 +113,8 @@ __nfp_rtsym_table_read(struct nfp_cpp *cpp, const struct nfp_mip *mip)
 		return NULL;
 
 	/* Align to 64 bits */
-	symtab_size = round_up(symtab_size, 8);
-	strtab_size = round_up(strtab_size, 8);
+	symtab_size = RTE_ALIGN_CEIL(symtab_size, 8);
+	strtab_size = RTE_ALIGN_CEIL(strtab_size, 8);
 
 	rtsymtab = malloc(symtab_size);
 	if (rtsymtab == NULL)
diff --git a/drivers/net/nfp/nfpcore/nfp_rtsym.h b/drivers/net/nfp/nfpcore/nfp_rtsym.h
index d2856e19c3..8b494211bc 100644
--- a/drivers/net/nfp/nfpcore/nfp_rtsym.h
+++ b/drivers/net/nfp/nfpcore/nfp_rtsym.h
@@ -15,25 +15,6 @@
 #define NFP_RTSYM_TARGET_LMEM           -1
 #define NFP_RTSYM_TARGET_EMU_CACHE      -7
 
-/*
- * This looks more complex than it should be. But we need to get the type for
- * the ~ right in round_down (it needs to be as wide as the result!), and we
- * want to evaluate the macro arguments just once each.
- */
-#define __round_mask(x, y) ((__typeof__(x))((y) - 1))
-
-#define round_up(x, y) \
-	(__extension__ ({ \
-		typeof(x) _x = (x); \
-		((((_x) - 1) | __round_mask(_x, y)) + 1); \
-	}))
-
-#define round_down(x, y) \
-	(__extension__ ({ \
-		typeof(x) _x = (x); \
-		((_x) & ~__round_mask(_x, y)); \
-	}))
-
 /*
  * Structure describing a run-time NFP symbol.
  *
-- 
2.39.1