AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-12-18 20:47:00 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

net: ethernet: mediatek: use [get|set]_link_ksettings

Browse Source 
1) use new api [get|set]_link_ksettings instead
of [get|set]_settings old ones.

2) dev->phydev is sure being ready before calling
these callbacks, so removing all the sanity check
if it is existing.

Signed-off-by: Sean Wang <sean.wang@mediatek.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Sean Wang 2016-09-22 16:42:03 +08:00 committed by David S. Miller
parent a2b2a19f0f
commit 3e60b748fd
1 changed files with 12 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
drivers/net/ethernet/mediatek/mtk_eth_soc.c
View File

@ -2034,35 +2034,26 @@ static int mtk_cleanup(struct mtk_eth *eth)
return 0;
}
static int mtk_get_settings(struct net_device *dev,
struct ethtool_cmd *cmd)
int mtk_get_link_ksettings(struct net_device *ndev,
struct ethtool_link_ksettings *cmd)
{
struct mtk_mac *mac = netdev_priv(dev);
int err;
struct mtk_mac *mac = netdev_priv(ndev);
if (unlikely(test_bit(MTK_RESETTING, &mac->hw->state)))
return -EBUSY;
err = phy_read_status(dev->phydev);
if (err)
return -ENODEV;
return phy_ethtool_gset(dev->phydev, cmd);
return phy_ethtool_ksettings_get(ndev->phydev, cmd);
}
static int mtk_set_settings(struct net_device *dev,
struct ethtool_cmd *cmd)
int mtk_set_link_ksettings(struct net_device *ndev,
const struct ethtool_link_ksettings *cmd)
{
struct mtk_mac *mac = netdev_priv(dev);
struct mtk_mac *mac = netdev_priv(ndev);
if (cmd->phy_address != dev->phydev->mdio.addr) {
dev->phydev = mdiobus_get_phy(mac->hw->mii_bus,
cmd->phy_address);
if (!dev->phydev)
return -ENODEV;
}
if (unlikely(test_bit(MTK_RESETTING, &mac->hw->state)))
return -EBUSY;
return phy_ethtool_sset(dev->phydev, cmd);
return phy_ethtool_ksettings_set(ndev->phydev, cmd);
}
static void mtk_get_drvinfo(struct net_device *dev,
@ -2225,8 +2216,8 @@ static int mtk_set_rxnfc(struct net_device *dev, struct ethtool_rxnfc *cmd)
}
static const struct ethtool_ops mtk_ethtool_ops = {
.get_settings = mtk_get_settings,
.set_settings = mtk_set_settings,
.get_link_ksettings = mtk_get_link_ksettings,
.set_link_ksettings = mtk_set_link_ksettings,
.get_drvinfo = mtk_get_drvinfo,
.get_msglevel = mtk_get_msglevel,
.set_msglevel = mtk_set_msglevel,