Skip to content

Commit b63cc73

Browse files
hkallweitkuba-moo
authored andcommitted
net: phy: realtek: use generic MDIO helpers to simplify the code
Use generic MDIO helpers to simplify the code. Signed-off-by: Heiner Kallweit <[email protected]> Reviewed-by: Andrew Lunn <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
1 parent d0466c7 commit b63cc73

File tree

1 file changed

+3
-17
lines changed

1 file changed

+3
-17
lines changed

drivers/net/phy/realtek.c

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -680,14 +680,7 @@ static int rtl822x_config_aneg(struct phy_device *phydev)
680680
int ret = 0;
681681

682682
if (phydev->autoneg == AUTONEG_ENABLE) {
683-
u16 adv = 0;
684-
685-
if (linkmode_test_bit(ETHTOOL_LINK_MODE_2500baseT_Full_BIT,
686-
phydev->advertising))
687-
adv |= MDIO_AN_10GBT_CTRL_ADV2_5G;
688-
if (linkmode_test_bit(ETHTOOL_LINK_MODE_5000baseT_Full_BIT,
689-
phydev->advertising))
690-
adv |= MDIO_AN_10GBT_CTRL_ADV5G;
683+
u16 adv = linkmode_adv_to_mii_10gbt_adv_t(phydev->advertising);
691684

692685
ret = phy_modify_paged_changed(phydev, 0xa5d, 0x12,
693686
MDIO_AN_10GBT_CTRL_ADV2_5G |
@@ -710,15 +703,8 @@ static int rtl822x_read_status(struct phy_device *phydev)
710703
if (lpadv < 0)
711704
return lpadv;
712705

713-
linkmode_mod_bit(ETHTOOL_LINK_MODE_10000baseT_Full_BIT,
714-
phydev->lp_advertising,
715-
lpadv & MDIO_AN_10GBT_STAT_LP10G);
716-
linkmode_mod_bit(ETHTOOL_LINK_MODE_5000baseT_Full_BIT,
717-
phydev->lp_advertising,
718-
lpadv & MDIO_AN_10GBT_STAT_LP5G);
719-
linkmode_mod_bit(ETHTOOL_LINK_MODE_2500baseT_Full_BIT,
720-
phydev->lp_advertising,
721-
lpadv & MDIO_AN_10GBT_STAT_LP2_5G);
706+
mii_10gbt_stat_mod_linkmode_lpa_t(phydev->lp_advertising,
707+
lpadv);
722708
}
723709

724710
ret = genphy_read_status(phydev);

0 commit comments

Comments
 (0)