net: hns3: remove redundant client_setup_tc handle

Since the real tx queue number and real rx queue number
always be updated when netdev opens, it's redundant
to call hclge_client_setup_tc to do the same thing.
So remove it.

Signed-off-by: Jian Shen <shenjian15@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/hnae3.h b/drivers/net/ethernet/hisilicon/hns3/hnae3.h
index e20a1b3..1254880 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hnae3.h
+++ b/drivers/net/ethernet/hisilicon/hns3/hnae3.h
@@ -292,7 +292,6 @@ struct hnae3_client_ops {
        int (*init_instance)(struct hnae3_handle *handle);
        void (*uninit_instance)(struct hnae3_handle *handle, bool reset);
        void (*link_status_change)(struct hnae3_handle *handle, bool state);
-       int (*setup_tc)(struct hnae3_handle *handle, u8 tc);
        int (*reset_notify)(struct hnae3_handle *handle,
                            enum hnae3_reset_notify_type type);
        void (*process_hw_error)(struct hnae3_handle *handle,

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
index cf16d5f..4c10b87 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
@@ -4378,20 +4378,6 @@ static void hns3_link_status_change(struct hnae3_handle *handle, bool linkup)
        }
 }
 
-static int hns3_client_setup_tc(struct hnae3_handle *handle, u8 tc)
-{
-       struct hnae3_knic_private_info *kinfo = &handle->kinfo;
-       struct net_device *ndev = kinfo->netdev;
-
-       if (tc > HNAE3_MAX_TC)
-               return -EINVAL;
-
-       if (!ndev)
-               return -ENODEV;
-
-       return hns3_nic_set_real_num_queue(ndev);
-}
-
 static void hns3_clear_tx_ring(struct hns3_enet_ring *ring)
 {
        while (ring->next_to_clean != ring->next_to_use) {
@@ -4828,7 +4814,6 @@ static const struct hnae3_client_ops client_ops = {
        .init_instance = hns3_client_init,
        .uninit_instance = hns3_client_uninit,
        .link_status_change = hns3_link_status_change,
-       .setup_tc = hns3_client_setup_tc,
        .reset_notify = hns3_reset_notify,
        .process_hw_error = hns3_process_hw_error,
 };

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_dcb.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_dcb.c
index e08d11b..5bf5db9 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_dcb.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_dcb.c
@@ -176,29 +176,6 @@ static int hclge_map_update(struct hclge_dev *hdev)
        return hclge_rss_init_hw(hdev);
 }
 
-static int hclge_client_setup_tc(struct hclge_dev *hdev)
-{
-       struct hclge_vport *vport = hdev->vport;
-       struct hnae3_client *client;
-       struct hnae3_handle *handle;
-       int ret;
-       u32 i;
-
-       for (i = 0; i < hdev->num_vmdq_vport + 1; i++) {
-               handle = &vport[i].nic;
-               client = handle->client;
-
-               if (!client || !client->ops || !client->ops->setup_tc)
-                       continue;
-
-               ret = client->ops->setup_tc(handle, hdev->tm_info.num_tc);
-               if (ret)
-                       return ret;
-       }
-
-       return 0;
-}
-
 static int hclge_notify_down_uinit(struct hclge_dev *hdev)
 {
        int ret;
@@ -257,10 +234,6 @@ static int hclge_ieee_setets(struct hnae3_handle *h, struct ieee_ets *ets)
                if (ret)
                        goto err_out;
 
-               ret = hclge_client_setup_tc(hdev);
-               if (ret)
-                       goto err_out;
-
                ret = hclge_notify_init_up(hdev);
                if (ret)
                        return ret;