diff mbox series

[net-next,v4,6/9] net: phy: marvell10g: use phy_read_mmd_poll_timeout() to simplify the code

Message ID 20200322065555.17742-7-zhengdejin5@gmail.com
State Superseded
Headers show
Series introduce read_poll_timeout | expand

Commit Message

Dejin Zheng March 22, 2020, 6:55 a.m. UTC 
use phy_read_mmd_poll_timeout() to replace the poll codes for
simplify mv3310_reset() function.

Suggested-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Dejin Zheng <zhengdejin5@gmail.com>
---
v3 -> v4:
	- add this patch by Andrew's suggestion. Thanks Andrew!

 drivers/net/phy/marvell10g.c | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

Comments

Andrew Lunn March 22, 2020, 3:36 p.m. UTC | #1 
> --- a/drivers/net/phy/marvell10g.c
> +++ b/drivers/net/phy/marvell10g.c
> @@ -241,22 +241,17 @@ static int mv3310_power_up(struct phy_device *phydev)
>  
>  static int mv3310_reset(struct phy_device *phydev, u32 unit)
>  {
> -	int retries, val, err;
> +	int val, err;
>  
>  	err = phy_modify_mmd(phydev, MDIO_MMD_PCS, unit + MDIO_CTRL1,
>  			     MDIO_CTRL1_RESET, MDIO_CTRL1_RESET);
>  	if (err < 0)
>  		return err;
>  
> -	retries = 20;
> -	do {
> -		msleep(5);
> -		val = phy_read_mmd(phydev, MDIO_MMD_PCS, unit + MDIO_CTRL1);
> -		if (val < 0)
> -			return val;
> -	} while (val & MDIO_CTRL1_RESET && --retries);

This is another example of the sleep happening first. To keep the code
more similar, you probably should add an msleep(5) before calling
phy_read_mmd_poll_timeout().

	Andrew
Dejin Zheng March 22, 2020, 4:18 p.m. UTC | #2 
On Sun, Mar 22, 2020 at 04:36:59PM +0100, Andrew Lunn wrote:
> > --- a/drivers/net/phy/marvell10g.c
> > +++ b/drivers/net/phy/marvell10g.c
> > @@ -241,22 +241,17 @@ static int mv3310_power_up(struct phy_device *phydev)
> >  
> >  static int mv3310_reset(struct phy_device *phydev, u32 unit)
> >  {
> > -	int retries, val, err;
> > +	int val, err;
> >  
> >  	err = phy_modify_mmd(phydev, MDIO_MMD_PCS, unit + MDIO_CTRL1,
> >  			     MDIO_CTRL1_RESET, MDIO_CTRL1_RESET);
> >  	if (err < 0)
> >  		return err;
> >  
> > -	retries = 20;
> > -	do {
> > -		msleep(5);
> > -		val = phy_read_mmd(phydev, MDIO_MMD_PCS, unit + MDIO_CTRL1);
> > -		if (val < 0)
> > -			return val;
> > -	} while (val & MDIO_CTRL1_RESET && --retries);
> 
> This is another example of the sleep happening first. To keep the code
> more similar, you probably should add an msleep(5) before calling
> phy_read_mmd_poll_timeout().
> 
> 	Andrew
Andrew, you're right, do it right away. Thank you for helping me so
patiently!
diff mbox series

Patch

diff --git a/drivers/net/phy/marvell10g.c b/drivers/net/phy/marvell10g.c
index 7e05b92504f0..90772a22286c 100644
--- a/drivers/net/phy/marvell10g.c
+++ b/drivers/net/phy/marvell10g.c
@@ -241,22 +241,17 @@  static int mv3310_power_up(struct phy_device *phydev)
 
 static int mv3310_reset(struct phy_device *phydev, u32 unit)
 {
-	int retries, val, err;
+	int val, err;
 
 	err = phy_modify_mmd(phydev, MDIO_MMD_PCS, unit + MDIO_CTRL1,
 			     MDIO_CTRL1_RESET, MDIO_CTRL1_RESET);
 	if (err < 0)
 		return err;
 
-	retries = 20;
-	do {
-		msleep(5);
-		val = phy_read_mmd(phydev, MDIO_MMD_PCS, unit + MDIO_CTRL1);
-		if (val < 0)
-			return val;
-	} while (val & MDIO_CTRL1_RESET && --retries);
-
-	return val & MDIO_CTRL1_RESET ? -ETIMEDOUT : 0;
+	return phy_read_mmd_poll_timeout(phydev, MDIO_MMD_PCS,
+					 unit + MDIO_CTRL1, val,
+					 !(val & MDIO_CTRL1_RESET),
+					 5000, 100000);
 }
 
 static int mv3310_get_edpd(struct phy_device *phydev, u16 *edpd)