The RTE_DIV_ROUND_UP in rte_common.h makes DIV_ROUND_UP redundant.
Signed-off-by: Joshua Washington <[email protected]>
Acked-by: Chengwen Feng <[email protected]>
Reviewed-by: Stephen Hemminger <[email protected]>
---
Changes in v4:
- Add rte_common.h includes.
---
drivers/net/hns3/hns3_ethdev.h | 2 --
drivers/net/hns3/hns3_fdir.c | 3 ++-
drivers/net/hns3/hns3_regs.c | 9 +++++----
drivers/net/hns3/hns3_rss.c | 9 +++++----
4 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/drivers/net/hns3/hns3_ethdev.h b/drivers/net/hns3/hns3_ethdev.h
index 209b042816..b4feff4b94 100644
--- a/drivers/net/hns3/hns3_ethdev.h
+++ b/drivers/net/hns3/hns3_ethdev.h
@@ -978,8 +978,6 @@ static inline struct hns3_vf *HNS3_DEV_HW_TO_VF(struct
hns3_hw *hw)
#define roundup(x, y) ((((x) + ((y) - 1)) / (y)) * (y))
#define rounddown(x, y) ((x) - ((x) % (y)))
-#define DIV_ROUND_UP(n, d) (((n) + (d) - 1) / (d))
-
/*
* Because hardware always access register in little-endian mode based on hns3
* network engine, so driver should also call rte_cpu_to_le_32 to convert data
diff --git a/drivers/net/hns3/hns3_fdir.c b/drivers/net/hns3/hns3_fdir.c
index 50572ae430..0096aa21e9 100644
--- a/drivers/net/hns3/hns3_fdir.c
+++ b/drivers/net/hns3/hns3_fdir.c
@@ -7,6 +7,7 @@
#include <rte_hash_crc.h>
#include <rte_io.h>
#include <rte_malloc.h>
+#include <rte_common.h>
#include "hns3_ethdev.h"
#include "hns3_logs.h"
@@ -129,7 +130,7 @@ static const struct key_info tuple_key_info[] = {
#define MAX_KEY_LENGTH 400
#define MAX_200B_KEY_LENGTH 200
#define MAX_META_DATA_LENGTH 16
-#define MAX_KEY_DWORDS DIV_ROUND_UP(MAX_KEY_LENGTH / HNS3_BITS_PER_BYTE, 4)
+#define MAX_KEY_DWORDS RTE_DIV_ROUND_UP(MAX_KEY_LENGTH / HNS3_BITS_PER_BYTE, 4)
#define MAX_KEY_BYTES (MAX_KEY_DWORDS * 4)
enum HNS3_FD_PACKET_TYPE {
diff --git a/drivers/net/hns3/hns3_regs.c b/drivers/net/hns3/hns3_regs.c
index 5c74f9ae2e..2bf0baa5c1 100644
--- a/drivers/net/hns3/hns3_regs.c
+++ b/drivers/net/hns3/hns3_regs.c
@@ -4,6 +4,7 @@
#include <ethdev_pci.h>
#include <rte_io.h>
+#include <rte_common.h>
#include "hns3_ethdev.h"
#include "hns3_logs.h"
@@ -1034,8 +1035,8 @@ hns3_get_32_bit_regs(struct hns3_hw *hw, uint32_t
regs_num, struct rte_dev_reg_i
if (regs_num == 0)
return 0;
- cmd_num = DIV_ROUND_UP(regs_num + HNS3_32_BIT_DESC_NODATA_LEN,
- HNS3_32_BIT_REG_RTN_DATANUM);
+ cmd_num = RTE_DIV_ROUND_UP(regs_num + HNS3_32_BIT_DESC_NODATA_LEN,
+ HNS3_32_BIT_REG_RTN_DATANUM);
desc = rte_zmalloc("hns3-32bit-regs",
sizeof(struct hns3_cmd_desc) * cmd_num, 0);
if (desc == NULL) {
@@ -1093,8 +1094,8 @@ hns3_get_64_bit_regs(struct hns3_hw *hw, uint32_t
regs_num, struct rte_dev_reg_i
if (regs_num == 0)
return 0;
- cmd_num = DIV_ROUND_UP(regs_num + HNS3_64_BIT_DESC_NODATA_LEN,
- HNS3_64_BIT_REG_RTN_DATANUM);
+ cmd_num = RTE_DIV_ROUND_UP(regs_num + HNS3_64_BIT_DESC_NODATA_LEN,
+ HNS3_64_BIT_REG_RTN_DATANUM);
desc = rte_zmalloc("hns3-64bit-regs",
sizeof(struct hns3_cmd_desc) * cmd_num, 0);
if (desc == NULL) {
diff --git a/drivers/net/hns3/hns3_rss.c b/drivers/net/hns3/hns3_rss.c
index 508b3e26d0..080800d60a 100644
--- a/drivers/net/hns3/hns3_rss.c
+++ b/drivers/net/hns3/hns3_rss.c
@@ -5,6 +5,7 @@
#include <rte_ethdev.h>
#include <rte_io.h>
#include <rte_malloc.h>
+#include <rte_common.h>
#include "hns3_ethdev.h"
#include "hns3_logs.h"
@@ -295,7 +296,7 @@ hns3_rss_set_algo_key(struct hns3_hw *hw, uint8_t hash_algo,
req = (struct hns3_rss_generic_config_cmd *)desc.data;
- max_bd_num = DIV_ROUND_UP(key_len, HNS3_RSS_HASH_KEY_NUM);
+ max_bd_num = RTE_DIV_ROUND_UP(key_len, HNS3_RSS_HASH_KEY_NUM);
for (idx = 0; idx < max_bd_num; idx++) {
hns3_cmd_setup_basic_desc(&desc, HNS3_OPC_RSS_GENERIC_CONFIG,
false);
@@ -335,7 +336,7 @@ hns3_rss_get_algo_key(struct hns3_hw *hw, uint8_t
*hash_algo,
int ret;
req = (struct hns3_rss_generic_config_cmd *)desc.data;
- max_bd_num = DIV_ROUND_UP(key_len, HNS3_RSS_HASH_KEY_NUM);
+ max_bd_num = RTE_DIV_ROUND_UP(key_len, HNS3_RSS_HASH_KEY_NUM);
for (idx = 0; idx < max_bd_num; idx++) {
hns3_cmd_setup_basic_desc(&desc, HNS3_OPC_RSS_GENERIC_CONFIG,
true);
@@ -381,7 +382,7 @@ hns3_set_rss_indir_table(struct hns3_hw *hw, uint16_t
*indir, uint16_t size)
int ret;
req = (struct hns3_rss_indirection_table_cmd *)desc.data;
- max_bd_num = DIV_ROUND_UP(size, HNS3_RSS_CFG_TBL_SIZE);
+ max_bd_num = RTE_DIV_ROUND_UP(size, HNS3_RSS_CFG_TBL_SIZE);
for (i = 0; i < max_bd_num; i++) {
hns3_cmd_setup_basic_desc(&desc, HNS3_OPC_RSS_INDIR_TABLE,
false);
@@ -431,7 +432,7 @@ hns3_get_rss_indir_table(struct hns3_hw *hw, uint16_t
*indir, uint16_t size)
int ret;
req = (struct hns3_rss_indirection_table_cmd *)desc.data;
- max_bd_num = DIV_ROUND_UP(size, HNS3_RSS_CFG_TBL_SIZE);
+ max_bd_num = RTE_DIV_ROUND_UP(size, HNS3_RSS_CFG_TBL_SIZE);
for (i = 0; i < max_bd_num; i++) {
hns3_cmd_setup_basic_desc(&desc, HNS3_OPC_RSS_INDIR_TABLE,
true);
--
2.56.0.rc1.315.gc6ed9934b7-goog
