net: phy: broadcom: drop brcm_phy_setbits() and use phy_set_bits() instead

Linux provides phy_set_bits() helper so let's drop brcm_phy_setbits() and
use phy_set_bits() in its place.

Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
Reviewed-by: Simon Horman <simon.horman@corigine.com>
Reviewed-by: Florian Fainelli <florian.fainelli@broadcom.com>
Link: https://lore.kernel.org/r/20230622184721.24368-1-giulio.benetti@benettiengineering.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/phy/broadcom.c b/drivers/net/phy/broadcom.c
index 9f0a9c5..59cae0d 100644 (file)
--- a/drivers/net/phy/broadcom.c
+++ b/drivers/net/phy/broadcom.c
@@ -664,17 +664,6 @@ static int bcm54616s_read_status(struct phy_device *phydev)
        return err;
 }
 
-static int brcm_phy_setbits(struct phy_device *phydev, int reg, int set)
-{
-       int val;
-
-       val = phy_read(phydev, reg);
-       if (val < 0)
-               return val;
-
-       return phy_write(phydev, reg, val | set);
-}
-
 static int brcm_fet_config_init(struct phy_device *phydev)
 {
        int reg, err, err2, brcmtest;
@@ -745,15 +734,15 @@ static int brcm_fet_config_init(struct phy_device *phydev)
                goto done;
 
        /* Enable auto MDIX */
-       err = brcm_phy_setbits(phydev, MII_BRCM_FET_SHDW_MISCCTRL,
-                                      MII_BRCM_FET_SHDW_MC_FAME);
+       err = phy_set_bits(phydev, MII_BRCM_FET_SHDW_MISCCTRL,
+                          MII_BRCM_FET_SHDW_MC_FAME);
        if (err < 0)
                goto done;
 
        if (phydev->dev_flags & PHY_BRCM_AUTO_PWRDWN_ENABLE) {
                /* Enable auto power down */
-               err = brcm_phy_setbits(phydev, MII_BRCM_FET_SHDW_AUXSTAT2,
-                                              MII_BRCM_FET_SHDW_AS2_APDE);
+               err = phy_set_bits(phydev, MII_BRCM_FET_SHDW_AUXSTAT2,
+                                  MII_BRCM_FET_SHDW_AS2_APDE);
        }
 
 done: