Skip to content

Commit 9b01c88

Browse files
oleremdavem330
authored andcommitted
net: phy: c22: migrate to genphy_c45_write_eee_adv()
Migrate from genphy_config_eee_advert() to genphy_c45_write_eee_adv(). It should work as before except write operation to the EEE adv registers will be done only if some EEE abilities was detected. If some driver will have a regression, related driver should provide own .get_features callback. See micrel.c:ksz9477_get_features() as example. Signed-off-by: Oleksij Rempel <[email protected]> Reviewed-by: Andrew Lunn <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 022c3f8 commit 9b01c88

File tree

1 file changed

+9
-1
lines changed

1 file changed

+9
-1
lines changed

drivers/net/phy/phy_device.c

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2231,7 +2231,10 @@ int __genphy_config_aneg(struct phy_device *phydev, bool changed)
22312231
{
22322232
int err;
22332233

2234-
if (genphy_config_eee_advert(phydev))
2234+
err = genphy_c45_write_eee_adv(phydev, phydev->supported_eee);
2235+
if (err < 0)
2236+
return err;
2237+
else if (err)
22352238
changed = true;
22362239

22372240
err = genphy_setup_master_slave(phydev);
@@ -2653,6 +2656,11 @@ int genphy_read_abilities(struct phy_device *phydev)
26532656
phydev->supported, val & ESTATUS_1000_XFULL);
26542657
}
26552658

2659+
/* This is optional functionality. If not supported, we may get an error
2660+
* which should be ignored.
2661+
*/
2662+
genphy_c45_read_eee_abilities(phydev);
2663+
26562664
return 0;
26572665
}
26582666
EXPORT_SYMBOL(genphy_read_abilities);

0 commit comments

Comments
 (0)