OSDN Git Service

net: hns3: remove the shaper param magic number
authorPeng Li <lipeng321@huawei.com>
Tue, 9 Feb 2021 02:41:53 +0000 (10:41 +0800)
committerDavid S. Miller <davem@davemloft.net>
Tue, 9 Feb 2021 23:34:07 +0000 (15:34 -0800)
To make the code more readable, this patch adds a definition for
the magic number 126 used for the default shaper param ir_b, and
rename macro DIVISOR_IR_B_126.

No functional change.

Signed-off-by: Peng Li <lipeng321@huawei.com>
Signed-off-by: Huazhong Tan <tanhuazhong@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c

index 906d98e..151afd1 100644 (file)
@@ -41,8 +41,9 @@ static int hclge_shaper_para_calc(u32 ir, u8 shaper_level,
                                  struct hclge_shaper_ir_para *ir_para,
                                  u32 max_tm_rate)
 {
+#define DEFAULT_SHAPER_IR_B    126
 #define DIVISOR_CLK            (1000 * 8)
-#define DIVISOR_IR_B_126       (126 * DIVISOR_CLK)
+#define DEFAULT_DIVISOR_IR_B   (DEFAULT_SHAPER_IR_B * DIVISOR_CLK)
 
        static const u16 tick_array[HCLGE_SHAPER_LVL_CNT] = {
                6 * 256,        /* Prioriy level */
@@ -69,10 +70,10 @@ static int hclge_shaper_para_calc(u32 ir, u8 shaper_level,
         * ir_calc = ---------------- * 1000
         *              tick * 1
         */
-       ir_calc = (DIVISOR_IR_B_126 + (tick >> 1) - 1) / tick;
+       ir_calc = (DEFAULT_DIVISOR_IR_B + (tick >> 1) - 1) / tick;
 
        if (ir_calc == ir) {
-               ir_para->ir_b = 126;
+               ir_para->ir_b = DEFAULT_SHAPER_IR_B;
                ir_para->ir_u = 0;
                ir_para->ir_s = 0;
 
@@ -81,7 +82,8 @@ static int hclge_shaper_para_calc(u32 ir, u8 shaper_level,
                /* Increasing the denominator to select ir_s value */
                while (ir_calc >= ir && ir) {
                        ir_s_calc++;
-                       ir_calc = DIVISOR_IR_B_126 / (tick * (1 << ir_s_calc));
+                       ir_calc = DEFAULT_DIVISOR_IR_B /
+                                 (tick * (1 << ir_s_calc));
                }
 
                ir_para->ir_b = (ir * tick * (1 << ir_s_calc) +
@@ -92,12 +94,12 @@ static int hclge_shaper_para_calc(u32 ir, u8 shaper_level,
 
                while (ir_calc < ir) {
                        ir_u_calc++;
-                       numerator = DIVISOR_IR_B_126 * (1 << ir_u_calc);
+                       numerator = DEFAULT_DIVISOR_IR_B * (1 << ir_u_calc);
                        ir_calc = (numerator + (tick >> 1)) / tick;
                }
 
                if (ir_calc == ir) {
-                       ir_para->ir_b = 126;
+                       ir_para->ir_b = DEFAULT_SHAPER_IR_B;
                } else {
                        u32 denominator = DIVISOR_CLK * (1 << --ir_u_calc);
                        ir_para->ir_b = (ir * tick + (denominator >> 1)) /