]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
net: phy: Make use of linkmode_mod_bit helper
authorFuqian Huang <huangfq.daxian@gmail.com>
Mon, 8 Jul 2019 12:34:17 +0000 (20:34 +0800)
committerDavid S. Miller <davem@davemloft.net>
Tue, 9 Jul 2019 03:10:34 +0000 (20:10 -0700)
linkmode_mod_bit is introduced as a helper function to set/clear
bits in a linkmode.
Replace the if else code structure with a call to the helper
linkmode_mod_bit.

Signed-off-by: Fuqian Huang <huangfq.daxian@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/phy/phy.c

index d9150765009ededecbba33b30c65a67751c541f7..ef7aa738e0dc4537e3234340c6b2e56110c949c6 100644 (file)
@@ -298,12 +298,8 @@ int phy_ethtool_sset(struct phy_device *phydev, struct ethtool_cmd *cmd)
 
        linkmode_copy(phydev->advertising, advertising);
 
-       if (AUTONEG_ENABLE == cmd->autoneg)
-               linkmode_set_bit(ETHTOOL_LINK_MODE_Autoneg_BIT,
-                                phydev->advertising);
-       else
-               linkmode_clear_bit(ETHTOOL_LINK_MODE_Autoneg_BIT,
-                                  phydev->advertising);
+       linkmode_mod_bit(ETHTOOL_LINK_MODE_Autoneg_BIT,
+                        phydev->advertising, AUTONEG_ENABLE == cmd->autoneg);
 
        phydev->duplex = cmd->duplex;
 
@@ -353,12 +349,8 @@ int phy_ethtool_ksettings_set(struct phy_device *phydev,
 
        linkmode_copy(phydev->advertising, advertising);
 
-       if (autoneg == AUTONEG_ENABLE)
-               linkmode_set_bit(ETHTOOL_LINK_MODE_Autoneg_BIT,
-                                phydev->advertising);
-       else
-               linkmode_clear_bit(ETHTOOL_LINK_MODE_Autoneg_BIT,
-                                  phydev->advertising);
+       linkmode_mod_bit(ETHTOOL_LINK_MODE_Autoneg_BIT,
+                        phydev->advertising, autoneg == AUTONEG_ENABLE);
 
        phydev->duplex = duplex;