net: hns3: move duplicated macro definition into header

BugLink: https://launchpad.net/bugs/1861972
Macro HCLGE_GET_DFX_REG_TYPE_CNT in hclge_dbg_get_dfx_bd_num()
and macro HCLGE_DFX_REG_BD_NUM in hclge_get_dfx_reg_bd_num()
have the same meaning, so just defines HCLGE_GET_DFX_REG_TYPE_CNT
in hclge_main.h.

Signed-off-by: Guojia Liao <liaoguojia@huawei.com>
Signed-off-by: Huazhong Tan <tanhuazhong@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
(cherry picked from commit 9027d043fc31145918b40b7a68956eaff4ddb5de)
Signed-off-by: Ike Panhc <ike.pan@canonical.com>
Signed-off-by: Seth Forshee <seth.forshee@canonical.com>

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c
index 112df34b38699bef744b01d98dd322fba8875150..81d531159ef49e89b27a92f88fb4970849283c23 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c
@@ -73,8 +73,6 @@ static struct hclge_dbg_reg_type_info hclge_dbg_reg_info[] = {
 
 static int hclge_dbg_get_dfx_bd_num(struct hclge_dev *hdev, int offset)
 {
-#define HCLGE_GET_DFX_REG_TYPE_CNT     4
-
        struct hclge_desc desc[HCLGE_GET_DFX_REG_TYPE_CNT];
        int entries_per_desc;
        int index;

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
index d862e9ba27e158e91afbc04669a3eb738bec765e..4304a36154e2fd601ab7503b5449ab5627a4ca32 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
@@ -10157,10 +10157,8 @@ static int hclge_get_dfx_reg_bd_num(struct hclge_dev *hdev,
                                    int *bd_num_list,
                                    u32 type_num)
 {
-#define HCLGE_DFX_REG_BD_NUM   4
-
        u32 entries_per_desc, desc_index, index, offset, i;
-       struct hclge_desc desc[HCLGE_DFX_REG_BD_NUM];
+       struct hclge_desc desc[HCLGE_GET_DFX_REG_TYPE_CNT];
        int ret;
 
        ret = hclge_query_bd_num_cmd_send(hdev, desc);

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h
index ebb4c6e9aed3779775a423763d603bf125e8e461..2df835b940b14a231f74150fee758e5043a78011 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h
@@ -139,6 +139,8 @@
 #define HCLGE_PHY_MDIX_STATUS_B                6
 #define HCLGE_PHY_SPEED_DUP_RESOLVE_B  11
 
+#define HCLGE_GET_DFX_REG_TYPE_CNT     4
+
 /* Factor used to calculate offset and bitmap of VF num */
 #define HCLGE_VF_NUM_PER_CMD           64