linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Dejin Zheng <zhengdejin5@gmail.com>
To: andrew@lunn.ch, f.fainelli@gmail.com, hkallweit1@gmail.com,
	linux@armlinux.org.uk, davem@davemloft.net,
	mchehab+samsung@kernel.org, gregkh@linuxfoundation.org,
	broonie@kernel.org, tglx@linutronix.de, netdev@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, Dejin Zheng <zhengdejin5@gmail.com>
Subject: [PATCH net-next v6 05/10] net: phy: aquantia: use phy_read_mmd_poll_timeout() to simplify the code
Date: Mon, 23 Mar 2020 10:56:28 +0800	[thread overview]
Message-ID: <20200323025633.6069-6-zhengdejin5@gmail.com> (raw)
In-Reply-To: <20200323025633.6069-1-zhengdejin5@gmail.com>

use phy_read_mmd_poll_timeout() to replace the poll codes for
simplify aqr107_wait_reset_complete() function.

Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Dejin Zheng <zhengdejin5@gmail.com>
---
v5 -> v6:
	- no changed
v4 -> v5:
	- no changed
v3 -> v4:
	- no changed
v2 -> v3:
	- adapt to it after modifying the parameter order of the
	  newly added function
v1 -> v2:
	- remove the handle of phy_read_mmd's return error.


 drivers/net/phy/aquantia_main.c | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/drivers/net/phy/aquantia_main.c b/drivers/net/phy/aquantia_main.c
index 31927b2c7d5a..db3e20938729 100644
--- a/drivers/net/phy/aquantia_main.c
+++ b/drivers/net/phy/aquantia_main.c
@@ -451,16 +451,11 @@ static int aqr107_set_tunable(struct phy_device *phydev,
  */
 static int aqr107_wait_reset_complete(struct phy_device *phydev)
 {
-	int val, retries = 100;
-
-	do {
-		val = phy_read_mmd(phydev, MDIO_MMD_VEND1, VEND1_GLOBAL_FW_ID);
-		if (val < 0)
-			return val;
-		msleep(20);
-	} while (!val && --retries);
+	int val;
 
-	return val ? 0 : -ETIMEDOUT;
+	return phy_read_mmd_poll_timeout(phydev, MDIO_MMD_VEND1,
+					 VEND1_GLOBAL_FW_ID, val,
+					 val != 0, 20000, 2000000);
 }
 
 static void aqr107_chip_info(struct phy_device *phydev)
-- 
2.25.0


  parent reply	other threads:[~2020-03-23  2:57 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-03-23  2:56 [PATCH net-next v6 00/10] introduce read_poll_timeout Dejin Zheng
2020-03-23  2:56 ` [PATCH net-next v6 01/10] iopoll: introduce read_poll_timeout macro Dejin Zheng
2020-03-23  2:56 ` [PATCH net-next v6 02/10] iopoll: redefined readx_poll_timeout macro to simplify the code Dejin Zheng
2020-03-23  2:56 ` [PATCH net-next v6 03/10] net: phy: introduce phy_read_mmd_poll_timeout macro Dejin Zheng
2020-03-23  3:21   ` Florian Fainelli
2020-03-23  2:56 ` [PATCH net-next v6 04/10] net: phy: bcm84881: use phy_read_mmd_poll_timeout() to simplify the code Dejin Zheng
2020-03-23  3:20   ` Florian Fainelli
2020-03-23  2:56 ` Dejin Zheng [this message]
2020-03-23  3:20   ` [PATCH net-next v6 05/10] net: phy: aquantia: " Florian Fainelli
2020-03-23  2:56 ` [PATCH net-next v6 06/10] net: phy: marvell10g: " Dejin Zheng
2020-03-23  2:56 ` [PATCH net-next v6 07/10] net: phy: introduce phy_read_poll_timeout macro Dejin Zheng
2020-03-23  3:19   ` Florian Fainelli
2020-03-23  2:56 ` [PATCH net-next v6 08/10] net: phy: use phy_read_poll_timeout() to simplify the code Dejin Zheng
2020-03-23  3:22   ` Florian Fainelli
2020-03-23  2:56 ` [PATCH net-next v6 09/10] net: phy: smsc: " Dejin Zheng
2020-03-23  3:17   ` Florian Fainelli
2020-03-23  2:56 ` [PATCH net-next v6 10/10] net: phy: tja11xx: " Dejin Zheng
2020-03-23  3:17   ` Florian Fainelli

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200323025633.6069-6-zhengdejin5@gmail.com \
    --to=zhengdejin5@gmail.com \
    --cc=andrew@lunn.ch \
    --cc=broonie@kernel.org \
    --cc=davem@davemloft.net \
    --cc=f.fainelli@gmail.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=hkallweit1@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux@armlinux.org.uk \
    --cc=mchehab+samsung@kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=tglx@linutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).