net: phy: marvell: use phy_modify_changed() for marvell_set_polarity()
Subsystems (3)
PATCH 1/1 net: phy: marvell: use phy_modify_changed() for marvell_set_polarity()
Rather than open-coding the phy_modify_changed() sequence, use this helper in marvell_set_polarity().
--- drivers/net/phy/marvell.c | 27 ++++++--------------------- 1 file changed, 6 insertions(+), 21 deletions(-)
drivers/net/phy/marvell.c +6 -21
@@ -367,39 +367,24 @@ static irqreturn_t marvell_handle_interrupt(struct phy_device *phydev)static int marvell_set_polarity (struct phy_device *phydev,int polarity) { -int reg; -int err; -int val; - -/* get the current settings */ - reg =phy_read (phydev,MII_M1011_PHY_SCR ); -if (reg <0 ) -return reg; +u16 val; - val = reg; - val &= ~MII_M1011_PHY_SCR_AUTO_CROSS ;switch (polarity) {case ETH_TP_MDI : - val |=MII_M1011_PHY_SCR_MDI ; + val =MII_M1011_PHY_SCR_MDI ;break ;case ETH_TP_MDI_X : - val |=MII_M1011_PHY_SCR_MDI_X ; + val =MII_M1011_PHY_SCR_MDI_X ;break ;case ETH_TP_MDI_AUTO :case ETH_TP_MDI_INVALID :default : - val |=MII_M1011_PHY_SCR_AUTO_CROSS ; + val =MII_M1011_PHY_SCR_AUTO_CROSS ;break ; } -if (val != reg) { -/* Set the new polarity value in the register */ - err =phy_write (phydev,MII_M1011_PHY_SCR , val); -if (err) -return err; - } - -return val != reg; +return phy_modify_changed (phydev,MII_M1011_PHY_SCR , +MII_M1011_PHY_SCR_AUTO_CROSS , val); }static int marvell_config_aneg (struct phy_device *phydev)
Signature · 1 line
2.20.1
Quoted 4 lines · Russell King
Rather than open-coding the
phy_modify_changed()sequence, use this helper inmarvell_set_polarity().Signed-off-by Russell King <[email protected]>
Andrew
Quoted 4 lines · On Thu, 03 Jun 2021 14:01:10 +0100 Russell King <[email protected]>…
Rather than open-coding the
phy_modify_changed()sequence, use this helper inmarvell_set_polarity().Signed-off-by Russell King <[email protected]>
This patch was applied to netdev/net-next.git (refs/heads/master):
Hello:
This patch was applied to netdev/net-next.git (refs/heads/master):
Quoted 7 lines · On Thu, 03 Jun 2021 14:01:10 +0100 you wrote:
Rather than open-coding the
phy_modify_changed()sequence, use this helper inmarvell_set_polarity().Signed-off-by Russell King <[email protected]>--- drivers/net/phy/marvell.c | 27 ++++++--------------------- 1 file changed, 6 insertions(+), 21 deletions(-)
Here is the summary with links:
- [net-next] net: phy: marvell: use phy_modify_changed() for marvell_set_polarity()
https://git.kernel.org/netdev/net-next/c/feb938fad63f
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html