The RTE_DIV_ROUND_UP in rte_common.h makes DIV_ROUND_UP redundant.
Signed-off-by: Joshua Washington <[email protected]>
---
Changes in v3:
- Change commit subject prefix from "drivers:" to "net/nfp:".
- Drop line rewraps in nfp_nfdk.h and nfp_nfdk_dp.c.
---
drivers/common/nfp/nfp_platform.h | 2 --
drivers/net/nfp/nfdk/nfp_nfdk.h | 2 +-
drivers/net/nfp/nfdk/nfp_nfdk_dp.c | 2 +-
drivers/net/nfp/nfpcore/nfp_nsp.c | 2 +-
4 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/drivers/common/nfp/nfp_platform.h
b/drivers/common/nfp/nfp_platform.h
index 0b02fcf1e8..814f90b5a2 100644
--- a/drivers/common/nfp/nfp_platform.h
+++ b/drivers/common/nfp/nfp_platform.h
@@ -10,8 +10,6 @@
#include <rte_bitops.h>
-#define DIV_ROUND_UP(n, d) (((n) + (d) - 1) / (d))
-
#define DMA_BIT_MASK(n) ((1ULL << (n)) - 1)
#define BITS_PER_LONG (__SIZEOF_LONG__ * 8)
diff --git a/drivers/net/nfp/nfdk/nfp_nfdk.h b/drivers/net/nfp/nfdk/nfp_nfdk.h
index 64c2b31308..df4d1eb8d9 100644
--- a/drivers/net/nfp/nfdk/nfp_nfdk.h
+++ b/drivers/net/nfp/nfdk/nfp_nfdk.h
@@ -168,7 +168,7 @@ static inline uint16_t
nfp_net_nfdk_headlen_to_segs(uint16_t headlen)
{
/* First descriptor fits less data, so adjust for that */
- return DIV_ROUND_UP(headlen + NFDK_TX_MAX_DATA_PER_DESC -
NFDK_TX_MAX_DATA_PER_HEAD,
+ return RTE_DIV_ROUND_UP(headlen + NFDK_TX_MAX_DATA_PER_DESC -
NFDK_TX_MAX_DATA_PER_HEAD,
NFDK_TX_MAX_DATA_PER_DESC);
}
diff --git a/drivers/net/nfp/nfdk/nfp_nfdk_dp.c
b/drivers/net/nfp/nfdk/nfp_nfdk_dp.c
index 15867ab62f..777550b6df 100644
--- a/drivers/net/nfp/nfdk/nfp_nfdk_dp.c
+++ b/drivers/net/nfp/nfdk/nfp_nfdk_dp.c
@@ -103,7 +103,7 @@ nfp_net_nfdk_tx_maybe_close_block(struct nfp_net_txq *txq,
n_descs = nfp_net_nfdk_headlen_to_segs(pkt_temp->data_len);
while (pkt_temp->next != NULL) {
pkt_temp = pkt_temp->next;
- n_descs += DIV_ROUND_UP(pkt_temp->data_len,
NFDK_TX_MAX_DATA_PER_DESC);
+ n_descs += RTE_DIV_ROUND_UP(pkt_temp->data_len,
NFDK_TX_MAX_DATA_PER_DESC);
}
if (unlikely(n_descs > NFDK_TX_DESC_GATHER_MAX))
diff --git a/drivers/net/nfp/nfpcore/nfp_nsp.c
b/drivers/net/nfp/nfpcore/nfp_nsp.c
index 43c13baabe..bd02efcc4a 100644
--- a/drivers/net/nfp/nfpcore/nfp_nsp.c
+++ b/drivers/net/nfp/nfpcore/nfp_nsp.c
@@ -542,7 +542,7 @@ nfp_nsp_command_buf_dma_sg(struct nfp_nsp *nsp,
struct nfp_nsp_dma_desc *descs;
chunk_size = RTE_BIT64(chunk_order);
- nseg = DIV_ROUND_UP(max_size, chunk_size);
+ nseg = RTE_DIV_ROUND_UP(max_size, chunk_size);
/* Malloc memory */
total_len = sizeof(struct nfp_nsp_dma_buf) +
--
2.55.0.1082.g2b9226bbc0-goog
