Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

net: phy: marvell: replace phy_modify()

a set of phy_set_bits() looks more neater

Signed-off-by: Yejune Deng <yejune.deng@gmail.com>
Link: https://lore.kernel.org/r/1606732895-9136-1-git-send-email-yejune.deng@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

authored by

Yejune Deng and committed by
Jakub Kicinski
832913c3 aaea1bab

+8 -8
+8 -8
drivers/net/phy/marvell.c
··· 1132 1132 return err; 1133 1133 1134 1134 /* PHY reset is necessary after changing MODE[2:0] */ 1135 - err = phy_modify(phydev, MII_88E1510_GEN_CTRL_REG_1, 0, 1136 - MII_88E1510_GEN_CTRL_REG_1_RESET); 1135 + err = phy_set_bits(phydev, MII_88E1510_GEN_CTRL_REG_1, 1136 + MII_88E1510_GEN_CTRL_REG_1_RESET); 1137 1137 if (err < 0) 1138 1138 return err; 1139 1139 ··· 1725 1725 __phy_read(phydev, MII_M1011_IEVENT); 1726 1726 1727 1727 /* Enable the WOL interrupt */ 1728 - err = __phy_modify(phydev, MII_88E1318S_PHY_CSIER, 0, 1729 - MII_88E1318S_PHY_CSIER_WOL_EIE); 1728 + err = __phy_set_bits(phydev, MII_88E1318S_PHY_CSIER, 1729 + MII_88E1318S_PHY_CSIER_WOL_EIE); 1730 1730 if (err < 0) 1731 1731 goto error; 1732 1732 ··· 1764 1764 goto error; 1765 1765 1766 1766 /* Clear WOL status and enable magic packet matching */ 1767 - err = __phy_modify(phydev, MII_88E1318S_PHY_WOL_CTRL, 0, 1768 - MII_88E1318S_PHY_WOL_CTRL_CLEAR_WOL_STATUS | 1769 - MII_88E1318S_PHY_WOL_CTRL_MAGIC_PACKET_MATCH_ENABLE); 1767 + err = __phy_set_bits(phydev, MII_88E1318S_PHY_WOL_CTRL, 1768 + MII_88E1318S_PHY_WOL_CTRL_CLEAR_WOL_STATUS | 1769 + MII_88E1318S_PHY_WOL_CTRL_MAGIC_PACKET_MATCH_ENABLE); 1770 1770 if (err < 0) 1771 1771 goto error; 1772 1772 } else { ··· 1995 1995 return bmsr; 1996 1996 1997 1997 if (bmcr & BMCR_ANENABLE) { 1998 - ret = phy_modify(phydev, MII_BMCR, BMCR_ANENABLE, 0); 1998 + ret = phy_clear_bits(phydev, MII_BMCR, BMCR_ANENABLE); 1999 1999 if (ret < 0) 2000 2000 return ret; 2001 2001 ret = genphy_soft_reset(phydev);