net: hns3: delete unnecessary blank line and space for cleanup

This patch deletes some unnecessary blank lines and spaces to clean up
code, and in hclgevf_set_vlan_filter() moves the comment to the front
of hclgevf_send_mbx_msg().

Signed-off-by: Guangbin Huang <huangguangbin2@huawei.com>
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/hns3_debugfs.c b/drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c
index 92ee1f5cf31fd438ee662bbe4ee98d1c91f4e34e..1d4ffc5f408ac35b17b6b199832b2f98cce80a3b 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c
@@ -176,7 +176,7 @@ static int hns3_dbg_bd_info(struct hnae3_handle *h, const char *cmd_buf)
                return -EINVAL;
        }
 
-       ring  = &priv->ring[q_num];
+       ring = &priv->ring[q_num];
        value = readl_relaxed(ring->tqp->io_base + HNS3_RING_TX_RING_TAIL_REG);
        tx_index = (cnt == 1) ? value : tx_index;
 
@@ -209,10 +209,10 @@ static int hns3_dbg_bd_info(struct hnae3_handle *h, const char *cmd_buf)
                 le16_to_cpu(tx_desc->tx.bdtp_fe_sc_vld_ra_ri));
        dev_info(dev, "(TX)mss: %u\n", le16_to_cpu(tx_desc->tx.mss));
 
-       ring  = &priv->ring[q_num + h->kinfo.num_tqps];
+       ring = &priv->ring[q_num + h->kinfo.num_tqps];
        value = readl_relaxed(ring->tqp->io_base + HNS3_RING_RX_RING_TAIL_REG);
        rx_index = (cnt == 1) ? value : tx_index;
-       rx_desc  = &ring->desc[rx_index];
+       rx_desc = &ring->desc[rx_index];
 
        addr = le64_to_cpu(rx_desc->addr);
        dev_info(dev, "RX Queue Num: %u, BD Index: %u\n", q_num, rx_index);

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c
index 2a472b06a3376870f7af40ee1e0a6a40d5795a21..4b8751387be92541619a7330cdd5351cc6e1200e 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c
@@ -1316,14 +1316,13 @@ static int hclgevf_set_vlan_filter(struct hnae3_handle *handle,
        msg_data[0] = is_kill;
        memcpy(&msg_data[1], &vlan_id, sizeof(vlan_id));
        memcpy(&msg_data[3], &proto, sizeof(proto));
-       ret = hclgevf_send_mbx_msg(hdev, HCLGE_MBX_SET_VLAN,
-                                  HCLGE_MBX_VLAN_FILTER, msg_data,
-                                  HCLGEVF_VLAN_MBX_MSG_LEN, true, NULL, 0);
-
        /* when remove hw vlan filter failed, record the vlan id,
         * and try to remove it from hw later, to be consistence
         * with stack.
         */
+       ret = hclgevf_send_mbx_msg(hdev, HCLGE_MBX_SET_VLAN,
+                                  HCLGE_MBX_VLAN_FILTER, msg_data,
+                                  HCLGEVF_VLAN_MBX_MSG_LEN, true, NULL, 0);
        if (is_kill && ret)
                set_bit(vlan_id, hdev->vlan_del_fail_bmap);