[14/14] net: phy: Make use of linkmode_mod_bit helper

Message ID	20190708123417.12265-1-huangfq.daxian@gmail.com
State	Accepted
Delegated to:	David Miller
Headers	show Return-Path: <netdev-owner@vger.kernel.org> From: Fuqian Huang <huangfq.daxian@gmail.com> Cc: Andrew Lunn <andrew@lunn.ch>, Florian Fainelli <f.fainelli@gmail.com>, Heiner Kallweit <hkallweit1@gmail.com>, "David S . Miller" <davem@davemloft.net>, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Fuqian Huang <huangfq.daxian@gmail.com> Subject: [PATCH 14/14] net: phy: Make use of linkmode_mod_bit helper Date: Mon, 8 Jul 2019 20:34:17 +0800 Message-Id: <20190708123417.12265-1-huangfq.daxian@gmail.com> To: unlisted-recipients:; (no To-header on input) Sender: netdev-owner@vger.kernel.org Precedence: bulk
Series	None \| expand [14/14] net: phy: Make use of linkmode_mod_bit helper

Message ID

20190708123417.12265-1-huangfq.daxian@gmail.com

State

Accepted

Delegated to:

David Miller

Headers

From: Fuqian Huang <huangfq.daxian@gmail.com>
Cc: Andrew Lunn <andrew@lunn.ch>, Florian Fainelli <f.fainelli@gmail.com>,
	Heiner Kallweit <hkallweit1@gmail.com>,
	"David S . Miller" <davem@davemloft.net>, netdev@vger.kernel.org,
	linux-kernel@vger.kernel.org, Fuqian Huang <huangfq.daxian@gmail.com>
Subject: [PATCH 14/14] net: phy: Make use of linkmode_mod_bit helper
Date: Mon,  8 Jul 2019 20:34:17 +0800
Message-Id: <20190708123417.12265-1-huangfq.daxian@gmail.com>
To: unlisted-recipients:; (no To-header on input)
Sender: netdev-owner@vger.kernel.org
Precedence: bulk

Series

None | expand

Commit Message

Fuqian Huang July 8, 2019, 12:34 p.m. UTC

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>
---
 drivers/net/phy/phy.c | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

Comments

David Miller July 9, 2019, 3:11 a.m. UTC | #1

From: Fuqian Huang <huangfq.daxian@gmail.com>
Date: Mon,  8 Jul 2019 20:34:17 +0800

> 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>

Applied to net-next, thanks.

diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index e8885429293a..75b8e5aff747 100644
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -297,12 +297,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;
 
@@ -352,12 +348,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;

[14/14] net: phy: Make use of linkmode_mod_bit helper

Commit Message

Comments

Patch