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

Merge branch 'net-phy-marvell10g-Clean-get_features-by-using-C45-helpers'

Browse Source 
Maxime Chevallier says:

====================
net: phy: marvell10g: Clean .get_features by using C45 helpers

Recent work on C45 helpers by Heiner made the
genphy_c45_pma_read_abilities function generic enough to use as a
default .get_featutes implementation.

This series removes the remaining redundant code in
mv3310_get_features(), and makes the 2110 PHY use
genphy_c45_pma_read_abilities() directly, since it doesn't have the
issue with the wrong abilities being reported.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2019-02-27 21:41:41 -08:00
commit d8afbc9795
1 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/net/phy/marvell10g.c
View File

@ -268,16 +268,6 @@ static int mv3310_get_features(struct phy_device *phydev)
{ {
int ret, val; int ret, val;
if (phydev->c45_ids.devices_in_package & MDIO_DEVS_AN) {
val = phy_read_mmd(phydev, MDIO_MMD_AN, MDIO_STAT1);
if (val < 0)
return val;
if (val & MDIO_AN_STAT1_ABLE)
linkmode_set_bit(ETHTOOL_LINK_MODE_Autoneg_BIT,
phydev->supported);
}
ret = genphy_c45_pma_read_abilities(phydev); ret = genphy_c45_pma_read_abilities(phydev);
if (ret) if (ret)
return ret; return ret;
@ -482,7 +472,7 @@ static struct phy_driver mv3310_drivers[] = {
.phy_id = MARVELL_PHY_ID_88E2110, .phy_id = MARVELL_PHY_ID_88E2110,
.phy_id_mask = MARVELL_PHY_ID_MASK, .phy_id_mask = MARVELL_PHY_ID_MASK,
.name = "mv88x2110", .name = "mv88x2110",
.features = PHY_10GBIT_FEATURES, .get_features = genphy_c45_pma_read_abilities,
.probe = mv3310_probe, .probe = mv3310_probe,
.soft_reset = gen10g_no_soft_reset, .soft_reset = gen10g_no_soft_reset,
.config_init = mv3310_config_init, .config_init = mv3310_config_init,