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 <o.rempel@pengutronix.de>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
index 66a4e62009bb573896b17964f77b61ce663fa77b..8d927c5e3bf8de76ee7229ae45b342934ab5baa7 100644 (file)
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
@@ -2231,7 +2231,10 @@ int __genphy_config_aneg(struct phy_device *phydev, bool changed)
 {
        int err;
 
-       if (genphy_config_eee_advert(phydev))
+       err = genphy_c45_write_eee_adv(phydev, phydev->supported_eee);
+       if (err < 0)
+               return err;
+       else if (err)
                changed = true;
 
        err = genphy_setup_master_slave(phydev);
@@ -2653,6 +2656,11 @@ int genphy_read_abilities(struct phy_device *phydev)
                                 phydev->supported, val & ESTATUS_1000_XFULL);
        }
 
+       /* This is optional functionality. If not supported, we may get an error
+        * which should be ignored.
+        */
+       genphy_c45_read_eee_abilities(phydev);
+
        return 0;
 }
 EXPORT_SYMBOL(genphy_read_abilities);