net/hns3: replace max private macro

This patch uses RTE_MAX function in DPDK lib to replace the private
macro named max_t in driver.

Signed-off-by: Huisong Li <lihuisong@huawei.com>
Signed-off-by: Wei Hu (Xavier) <xavier.huwei@huawei.com>

diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c
index b9ee114..fca035d 100644 (file)
--- a/drivers/net/hns3/hns3_ethdev.c
+++ b/drivers/net/hns3/hns3_ethdev.c
@@ -3285,7 +3285,7 @@ hns3_is_rx_buf_ok(struct hns3_hw *hw, struct hns3_pkt_buf_alloc *buf_alloc,
                                        + pf->dv_buf_size;
 
        shared_buf_tc = tc_num * aligned_mps + aligned_mps;
-       shared_std = roundup(max_t(uint32_t, shared_buf_min, shared_buf_tc),
+       shared_std = roundup(RTE_MAX(shared_buf_min, shared_buf_tc),
                             HNS3_BUF_SIZE_UNIT);
 
        rx_priv = hns3_get_rx_priv_buff_alloced(buf_alloc);
@@ -3315,8 +3315,7 @@ hns3_is_rx_buf_ok(struct hns3_hw *hw, struct hns3_pkt_buf_alloc *buf_alloc,
                if (tc_num)
                        hi_thrd = hi_thrd / tc_num;
 
-               hi_thrd = max_t(uint32_t, hi_thrd,
-                               HNS3_BUF_MUL_BY * aligned_mps);
+               hi_thrd = RTE_MAX(hi_thrd, HNS3_BUF_MUL_BY * aligned_mps);
                hi_thrd = rounddown(hi_thrd, HNS3_BUF_SIZE_UNIT);
                lo_thrd = hi_thrd - aligned_mps / HNS3_BUF_DIV_BY;
        } else {

diff --git a/drivers/net/hns3/hns3_ethdev.h b/drivers/net/hns3/hns3_ethdev.h
index 6c03433..9e49e28 100644 (file)
--- a/drivers/net/hns3/hns3_ethdev.h
+++ b/drivers/net/hns3/hns3_ethdev.h
@@ -708,11 +708,6 @@ struct hns3_adapter {
 
 #define DIV_ROUND_UP(n, d) (((n) + (d) - 1) / (d))
 
-#define max_t(type, x, y) ({                    \
-       type __max1 = (x);                      \
-       type __max2 = (y);                      \
-       __max1 > __max2 ? __max1 : __max2; })
-
 static inline void hns3_write_reg(void *base, uint32_t reg, uint32_t value)
 {
        rte_write32(value, (volatile void *)((char *)base + reg));