Commit 28e219ae authored by Giulio Benetti's avatar Giulio Benetti Committed by Jakub Kicinski

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: default avatarGiulio Benetti <giulio.benetti@benettiengineering.com>
Reviewed-by: default avatarSimon Horman <simon.horman@corigine.com>
Reviewed-by: default avatarFlorian Fainelli <florian.fainelli@broadcom.com>
Link: https://lore.kernel.org/r/20230622184721.24368-1-giulio.benetti@benettiengineering.comSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent a685d0df
...@@ -664,17 +664,6 @@ static int bcm54616s_read_status(struct phy_device *phydev) ...@@ -664,17 +664,6 @@ static int bcm54616s_read_status(struct phy_device *phydev)
return err; 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) static int brcm_fet_config_init(struct phy_device *phydev)
{ {
int reg, err, err2, brcmtest; int reg, err, err2, brcmtest;
...@@ -745,14 +734,14 @@ static int brcm_fet_config_init(struct phy_device *phydev) ...@@ -745,14 +734,14 @@ static int brcm_fet_config_init(struct phy_device *phydev)
goto done; goto done;
/* Enable auto MDIX */ /* Enable auto MDIX */
err = brcm_phy_setbits(phydev, MII_BRCM_FET_SHDW_MISCCTRL, err = phy_set_bits(phydev, MII_BRCM_FET_SHDW_MISCCTRL,
MII_BRCM_FET_SHDW_MC_FAME); MII_BRCM_FET_SHDW_MC_FAME);
if (err < 0) if (err < 0)
goto done; goto done;
if (phydev->dev_flags & PHY_BRCM_AUTO_PWRDWN_ENABLE) { if (phydev->dev_flags & PHY_BRCM_AUTO_PWRDWN_ENABLE) {
/* Enable auto power down */ /* Enable auto power down */
err = brcm_phy_setbits(phydev, MII_BRCM_FET_SHDW_AUXSTAT2, err = phy_set_bits(phydev, MII_BRCM_FET_SHDW_AUXSTAT2,
MII_BRCM_FET_SHDW_AS2_APDE); MII_BRCM_FET_SHDW_AS2_APDE);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment