net: hns3: remove two duplicated register macros in hclgevf_main.h

HCLGEVF_CMDQ_INTR_SRC_REG and HCLGEVF_CMDQ_INTR_STS_REG are same
as HCLGEVF_VECTOR0_CMDQ_SRC_REG and HCLGEVF_VECTOR0_CMDQ_STAT_REG,
replace the former with the latter, and rename macro
HCLGEVF_VECTOR0_CMDQ_STAT_REG since 'stat' is not abbreviation of
'state'.

Signed-off-by: Huazhong Tan <tanhuazhong@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c
index be5789bb5ddd39d39013f238e0d3eb213c77f745..a8c0e79901f52ee86dda24ca8296725020c7c3e1 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c
@@ -46,7 +46,7 @@ static const u32 cmdq_reg_addr_list[] = {HCLGEVF_CMDQ_TX_ADDR_L_REG,
                                         HCLGEVF_CMDQ_RX_TAIL_REG,
                                         HCLGEVF_CMDQ_RX_HEAD_REG,
                                         HCLGEVF_VECTOR0_CMDQ_SRC_REG,
-                                        HCLGEVF_CMDQ_INTR_STS_REG,
+                                        HCLGEVF_VECTOR0_CMDQ_STATE_REG,
                                         HCLGEVF_CMDQ_INTR_EN_REG,
                                         HCLGEVF_CMDQ_INTR_GEN_REG};
 
@@ -1826,7 +1826,7 @@ static void hclgevf_dump_rst_info(struct hclgevf_dev *hdev)
        dev_info(&hdev->pdev->dev, "vector0 interrupt enable status: 0x%x\n",
                 hclgevf_read_dev(&hdev->hw, HCLGEVF_MISC_VECTOR_REG_BASE));
        dev_info(&hdev->pdev->dev, "vector0 interrupt status: 0x%x\n",
-                hclgevf_read_dev(&hdev->hw, HCLGEVF_VECTOR0_CMDQ_STAT_REG));
+                hclgevf_read_dev(&hdev->hw, HCLGEVF_VECTOR0_CMDQ_STATE_REG));
        dev_info(&hdev->pdev->dev, "handshake status: 0x%x\n",
                 hclgevf_read_dev(&hdev->hw, HCLGEVF_CMDQ_TX_DEPTH_REG));
        dev_info(&hdev->pdev->dev, "function reset status: 0x%x\n",
@@ -2250,7 +2250,7 @@ static enum hclgevf_evt_cause hclgevf_check_evt_cause(struct hclgevf_dev *hdev,
 
        /* fetch the events from their corresponding regs */
        cmdq_stat_reg = hclgevf_read_dev(&hdev->hw,
-                                        HCLGEVF_VECTOR0_CMDQ_STAT_REG);
+                                        HCLGEVF_VECTOR0_CMDQ_STATE_REG);
 
        if (BIT(HCLGEVF_VECTOR0_RST_INT_B) & cmdq_stat_reg) {
                rst_ing_reg = hclgevf_read_dev(&hdev->hw, HCLGEVF_RST_ING);

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h
index f19583c4bc9b8ef2c794f1cbea4608093c5f032e..738de124cfc4e9f92836763de9d51593d6e336b0 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h
@@ -42,8 +42,6 @@
 #define HCLGEVF_CMDQ_RX_DEPTH_REG              0x27020
 #define HCLGEVF_CMDQ_RX_TAIL_REG               0x27024
 #define HCLGEVF_CMDQ_RX_HEAD_REG               0x27028
-#define HCLGEVF_CMDQ_INTR_SRC_REG              0x27100
-#define HCLGEVF_CMDQ_INTR_STS_REG              0x27104
 #define HCLGEVF_CMDQ_INTR_EN_REG               0x27108
 #define HCLGEVF_CMDQ_INTR_GEN_REG              0x2710C
 
@@ -88,7 +86,7 @@
 /* Vector0 interrupt CMDQ event source register(RW) */
 #define HCLGEVF_VECTOR0_CMDQ_SRC_REG   0x27100
 /* Vector0 interrupt CMDQ event status register(RO) */
-#define HCLGEVF_VECTOR0_CMDQ_STAT_REG  0x27104
+#define HCLGEVF_VECTOR0_CMDQ_STATE_REG 0x27104
 /* CMDQ register bits for RX event(=MBX event) */
 #define HCLGEVF_VECTOR0_RX_CMDQ_INT_B  1
 /* RST register bits for RESET event */