From 69bdfc26c70b5089a97729cddf58ffa7ec719a12 Mon Sep 17 00:00:00 2001 From: huangguangbin2 Date: Tue, 2 Jul 2019 15:11:40 +0800 Subject: [PATCH] net: hns3: fix a repeat code warning in two functions. driver inclusion category: bugfix bugzilla: NA CVE: NA This patch fixes a repeat code warning in two functions, and wrap the same codes into a function. Feature or Bugfix:Bugfix Signed-off-by: huangguangbin (A) Reviewed-by: lipeng Reviewed-by: Yang Yingliang Signed-off-by: Yang Yingliang --- .../hisilicon/hns3/hns3pf/hclge_debugfs.c | 10 +------- .../hisilicon/hns3/hns3pf/hclge_main.c | 23 +++++++++++++------ .../hisilicon/hns3/hns3pf/hclge_main.h | 2 ++ 3 files changed, 19 insertions(+), 16 deletions(-) diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c index aec14ee3fc08..2ee0d7ad9fb4 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c @@ -16,15 +16,7 @@ static int hclge_dbg_get_dfx_bd_num(struct hclge_dev *hdev, int offset) int index; int ret; - hclge_cmd_setup_basic_desc(&desc[0], HCLGE_OPC_DFX_BD_NUM, true); - desc[0].flag |= cpu_to_le16(HCLGE_CMD_FLAG_NEXT); - hclge_cmd_setup_basic_desc(&desc[1], HCLGE_OPC_DFX_BD_NUM, true); - desc[1].flag |= cpu_to_le16(HCLGE_CMD_FLAG_NEXT); - hclge_cmd_setup_basic_desc(&desc[2], HCLGE_OPC_DFX_BD_NUM, true); - desc[2].flag |= cpu_to_le16(HCLGE_CMD_FLAG_NEXT); - hclge_cmd_setup_basic_desc(&desc[3], HCLGE_OPC_DFX_BD_NUM, true); - - ret = hclge_cmd_send(&hdev->hw, desc, 4); + ret = hclge_query_bd_num_cmd_send(hdev, desc); if (ret != HCLGE_CMD_EXEC_SUCCESS) { dev_err(&hdev->pdev->dev, "get dfx bdnum fail, status is %d.\n", ret); diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c index 2eab0ee5e573..232029f05629 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c @@ -9596,13 +9596,8 @@ static int hclge_get_64_bit_regs(struct hclge_dev *hdev, u32 regs_num, #define REG_NUM_REMAIN_MASK 3 #define BD_LIST_MAX_NUM 30 -static int hclge_get_dfx_reg_bd_num(struct hclge_dev *hdev, - int *bd_num_list, - u32 type_num) +int hclge_query_bd_num_cmd_send(struct hclge_dev *hdev, struct hclge_desc *desc) { - u32 entries_per_desc, desc_index, index, i; - enum hclge_dfx_reg_offset offset; - struct hclge_desc desc[4]; int ret; /*prepare 4 commands to query DFX BD number*/ @@ -9615,9 +9610,23 @@ static int hclge_get_dfx_reg_bd_num(struct hclge_dev *hdev, hclge_cmd_setup_basic_desc(&desc[3], HCLGE_OPC_DFX_BD_NUM, true); ret = hclge_cmd_send(&hdev->hw, desc, 4); + + return ret; +} + +static int hclge_get_dfx_reg_bd_num(struct hclge_dev *hdev, + int *bd_num_list, + u32 type_num) +{ + u32 entries_per_desc, desc_index, index, i; + enum hclge_dfx_reg_offset offset; + struct hclge_desc desc[4]; + int ret; + + ret = hclge_query_bd_num_cmd_send(hdev, desc); if (ret != HCLGE_CMD_EXEC_SUCCESS) { dev_err(&hdev->pdev->dev, - "Query dfx bd num fail, status is %d.\n", ret); + "Get dfx bd num fail, status is %d.\n", ret); return ret; } diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h index fdb07373feef..2fb3f77a01af 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h +++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h @@ -1032,4 +1032,6 @@ int hclge_push_vf_port_base_vlan_info(struct hclge_vport *vport, u8 vfid, enum hnae3_reset_type hclge_get_reset_level(struct hnae3_ae_dev *ae_dev, unsigned long *addr); void hclge_link_status_change(struct hclge_dev *hdev, int state); +int hclge_query_bd_num_cmd_send(struct hclge_dev *hdev, + struct hclge_desc *desc); #endif -- GitLab