Subject: Re: [PATCH] net: phy: broadcom: drop brcm_phy_setbits() and use phy_set_bits() instead

From: Simon Horman <[email-masked]>
Date: Thu, 22 Jun 2023 17:35:12 +0200

On Thu, Jun 22, 2023 at 02:48:46PM +0200, Giulio Benetti wrote:
> Pardon,
> 
> On 22/06/23 14:37, Giulio Benetti wrote:
> > 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 <[email-masked]>
> > ---
> >   drivers/net/phy/broadcom.c | 15 ++-------------
> >   1 file changed, 2 insertions(+), 13 deletions(-)
> > 
> > diff --git a/drivers/net/phy/broadcom.c b/drivers/net/phy/broadcom.c
> > index ad71c88c87e7..d684c5be529a 100644
> > --- a/drivers/net/phy/broadcom.c
> > +++ b/drivers/net/phy/broadcom.c
> > @@ -608,17 +608,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;
> > @@ -689,14 +678,14 @@ 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,
> > +	err = phy_set_bits(phydev, MII_BRCM_FET_SHDW_MISCCTRL,
> >   				       MII_BRCM_FET_SHDW_MC_FAME);
> 
> I've missed to checkpatch.pl and there is a style error ^^^
> 
> >   	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,
> > +		err = phy_set_bits(phydev, MII_BRCM_FET_SHDW_AUXSTAT2,
> >   					       MII_BRCM_FET_SHDW_AS2_APDE);
> 
>                                       and here ^^^
> 
> I wait some time for any feedback and then I send a V2.

Hi Giulio,

Please include the target tree, net-next, when you send v2:

	Subject: [PATCH net-next v2] ...