net: hns: remove redundant hns_mac_dev_to_enet_if()

The sequence of hns_mac_dev_to_enet_if() is the same as
hns_get_enet_interface(), and hns_get_enet_interface() is called
by initialization to get the mac mode. And the mode is not changed
anywhere. Thus add hns_mac_dev_to_enet_if() function to get the mac
mode is obviously redundant.

Reported-by: Jinchuan Tian <tianjinchuan1@huawei.com>
Signed-off-by: Kejian Yan <yankejian@huawei.com>
Signed-off-by: Yisen Zhuang <Yisen.Zhuang@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c
index c526558e63673be2e91916c53b990940508af759..d2effcca46c6a00b6fc07c8cb595091c5c733970 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c
+++ b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c
@@ -56,20 +56,6 @@ static const enum mac_mode g_mac_mode_1000[] = {
        [PHY_INTERFACE_MODE_RTBI]   = MAC_MODE_RTBI_1000
 };
 
-static enum mac_mode hns_mac_dev_to_enet_if(const struct hns_mac_cb *mac_cb)
-{
-       switch (mac_cb->max_speed) {
-       case MAC_SPEED_100:
-               return g_mac_mode_100[mac_cb->phy_if];
-       case MAC_SPEED_1000:
-               return g_mac_mode_1000[mac_cb->phy_if];
-       case MAC_SPEED_10000:
-               return MAC_MODE_XGMII_10000;
-       default:
-               return MAC_MODE_MII_100;
-       }
-}
-
 static enum mac_mode hns_get_enet_interface(const struct hns_mac_cb *mac_cb)
 {
        switch (mac_cb->max_speed) {
@@ -134,7 +120,6 @@ void hns_mac_adjust_link(struct hns_mac_cb *mac_cb, int speed, int duplex)
 
        mac_cb->speed = speed;
        mac_cb->half_duplex = !duplex;
-       mac_ctrl_drv->mac_mode = hns_mac_dev_to_enet_if(mac_cb);
 
        if (mac_ctrl_drv->adjust_link) {
                ret = mac_ctrl_drv->adjust_link(mac_ctrl_drv,