net: hns3: Remove redundant codes of query advertised flow control abilitiy

If the advertised flow control ability has been fetched using
phy_ethtool_ksettings_get() or hclge_get_link_mode() then it is
unnecessary to fetch them again later using hclge_get_flowctrl_adv().
This patch removes it.

Signed-off-by: Jian Shen <shenjian15@huawei.com>
Signed-off-by: Peng Li <lipeng321@huawei.com>
Signed-off-by: Salil Mehta <salil.mehta@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c b/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c
index dfce76e7cbcaea0c64f42e0c50bc905b6cffc9be..41d817d80b35cdc0c286dedca3d785c1f8532781 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c
@@ -591,18 +591,6 @@ static int hns3_get_link_ksettings(struct net_device *netdev,
        /* 4.mdio_support */
        cmd->base.mdio_support = ETH_MDIO_SUPPORTS_C22;
 
-       /* 5.get flow control setttings */
-       if (h->ae_algo->ops->get_flowctrl_adv)
-               h->ae_algo->ops->get_flowctrl_adv(h, &flowctrl_adv);
-
-       if (flowctrl_adv & ADVERTISED_Pause)
-               ethtool_link_ksettings_add_link_mode(cmd, advertising,
-                                                    Pause);
-
-       if (flowctrl_adv & ADVERTISED_Asym_Pause)
-               ethtool_link_ksettings_add_link_mode(cmd, advertising,
-                                                    Asym_Pause);
-
        return 0;
 }
 

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
index 25d4fd9970f8cda21c06e3e156324dba2b4e594f..c56db06b63e07517aaa779ded8e4c5e90579428c 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
@@ -5221,20 +5221,6 @@ static u32 hclge_get_fw_version(struct hnae3_handle *handle)
        return hdev->fw_version;
 }
 
-static void hclge_get_flowctrl_adv(struct hnae3_handle *handle,
-                                  u32 *flowctrl_adv)
-{
-       struct hclge_vport *vport = hclge_get_vport(handle);
-       struct hclge_dev *hdev = vport->back;
-       struct phy_device *phydev = hdev->hw.mac.phydev;
-
-       if (!phydev)
-               return;
-
-       *flowctrl_adv |= (phydev->advertising & ADVERTISED_Pause) |
-                        (phydev->advertising & ADVERTISED_Asym_Pause);
-}
-
 static void hclge_set_flowctrl_adv(struct hclge_dev *hdev, u32 rx_en, u32 tx_en)
 {
        struct phy_device *phydev = hdev->hw.mac.phydev;
@@ -6335,7 +6321,6 @@ static const struct hnae3_ae_ops hclge_ops = {
        .get_tqps_and_rss_info = hclge_get_tqps_and_rss_info,
        .set_channels = hclge_set_channels,
        .get_channels = hclge_get_channels,
-       .get_flowctrl_adv = hclge_get_flowctrl_adv,
        .get_regs_len = hclge_get_regs_len,
        .get_regs = hclge_get_regs,
        .set_led_id = hclge_set_led_id,