OSDN Git Service

net: phy: use phy_modify_mmd_changed in genphy_c45_an_config_aneg
authorHeiner Kallweit <hkallweit1@gmail.com>
Mon, 4 Mar 2019 18:50:40 +0000 (19:50 +0100)
committerDavid S. Miller <davem@davemloft.net>
Mon, 4 Mar 2019 21:10:10 +0000 (13:10 -0800)
As can be seen from the usage of the return value, we should use
phy_modify_mmd_changed() here.

Fixes: 9a5dc8af4416 ("net: phy: add genphy_c45_an_config_aneg")
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/phy/phy-c45.c

index c596eb5..9e24d95 100644 (file)
@@ -99,10 +99,10 @@ int genphy_c45_an_config_aneg(struct phy_device *phydev)
 
        adv = linkmode_adv_to_mii_adv_t(phydev->advertising);
 
-       ret = phy_modify_mmd(phydev, MDIO_MMD_AN, MDIO_AN_ADVERTISE,
-                            ADVERTISE_ALL | ADVERTISE_100BASE4 |
-                            ADVERTISE_PAUSE_CAP | ADVERTISE_PAUSE_ASYM,
-                            adv);
+       ret = phy_modify_mmd_changed(phydev, MDIO_MMD_AN, MDIO_AN_ADVERTISE,
+                                    ADVERTISE_ALL | ADVERTISE_100BASE4 |
+                                    ADVERTISE_PAUSE_CAP | ADVERTISE_PAUSE_ASYM,
+                                    adv);
        if (ret < 0)
                return ret;
        if (ret > 0)
@@ -110,11 +110,10 @@ int genphy_c45_an_config_aneg(struct phy_device *phydev)
 
        adv = linkmode_adv_to_mii_10gbt_adv_t(phydev->advertising);
 
-       ret = phy_modify_mmd(phydev, MDIO_MMD_AN, MDIO_AN_10GBT_CTRL,
-                            MDIO_AN_10GBT_CTRL_ADV10G |
-                            MDIO_AN_10GBT_CTRL_ADV5G |
-                            MDIO_AN_10GBT_CTRL_ADV2_5G,
-                            adv);
+       ret = phy_modify_mmd_changed(phydev, MDIO_MMD_AN, MDIO_AN_10GBT_CTRL,
+                                    MDIO_AN_10GBT_CTRL_ADV10G |
+                                    MDIO_AN_10GBT_CTRL_ADV5G |
+                                    MDIO_AN_10GBT_CTRL_ADV2_5G, adv);
        if (ret < 0)
                return ret;
        if (ret > 0)