net: phy: simplify genphy_config_advert by using the linkmode_adv_to_xxx_t functions

Using linkmode_adv_to_mii_adv_t and linkmode_adv_to_mii_ctrl1000_t
allows to simplify the code. In addition avoiding the conversion to
the legacy u32 advertisement format allows to remove the warning.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Suggested-by: Andrew Lunn <andrew@lunn.ch>
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 7ddd91df99e3dc24db6d374ba7b5e911c4716f47..a70a98dc987998712e29b214bd4328604e778846 100644 (file)
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
@@ -1564,24 +1564,20 @@ EXPORT_SYMBOL(phy_reset_after_clk_enable);
  */
 static int genphy_config_advert(struct phy_device *phydev)
 {
-       u32 advertise;
-       int bmsr, adv;
-       int err, changed = 0;
+       int err, bmsr, changed = 0;
+       u32 adv;
 
        /* Only allow advertising what this PHY supports */
        linkmode_and(phydev->advertising, phydev->advertising,
                     phydev->supported);
-       if (!ethtool_convert_link_mode_to_legacy_u32(&advertise,
-                                                    phydev->advertising))
-               phydev_warn(phydev, "PHY advertising (%*pb) more modes than genphy supports, some modes not advertised.\n",
-                           __ETHTOOL_LINK_MODE_MASK_NBITS,
-                           phydev->advertising);
+
+       adv = linkmode_adv_to_mii_adv_t(phydev->advertising);
 
        /* Setup standard advertisement */
        err = phy_modify_changed(phydev, MII_ADVERTISE,
                                 ADVERTISE_ALL | ADVERTISE_100BASE4 |
                                 ADVERTISE_PAUSE_CAP | ADVERTISE_PAUSE_ASYM,
-                                ethtool_adv_to_mii_adv_t(advertise));
+                                adv);
        if (err < 0)
                return err;
        if (err > 0)
@@ -1598,13 +1594,7 @@ static int genphy_config_advert(struct phy_device *phydev)
        if (!(bmsr & BMSR_ESTATEN))
                return changed;
 
-       /* Configure gigabit if it's supported */
-       adv = 0;
-       if (linkmode_test_bit(ETHTOOL_LINK_MODE_1000baseT_Half_BIT,
-                             phydev->supported) ||
-           linkmode_test_bit(ETHTOOL_LINK_MODE_1000baseT_Full_BIT,
-                             phydev->supported))
-               adv = ethtool_adv_to_mii_ctrl1000_t(advertise);
+       adv = linkmode_adv_to_mii_ctrl1000_t(phydev->advertising);
 
        err = phy_modify_changed(phydev, MII_CTRL1000,
                                 ADVERTISE_1000FULL | ADVERTISE_1000HALF,