public inbox for linux-kernel@vger.kernel.org
 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, tglx@linutronix.de,
	broonie@kernel.org, corbet@lwn.net, mchehab+samsung@kernel.org,
	netdev@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, Dejin Zheng <zhengdejin5@gmail.com>
Subject: [PATCH net-next 4/7] net: phy: bcm84881: use phy_read_mmd_poll_timeout() to simplify the code
Date: Fri, 20 Mar 2020 00:39:07 +0800	[thread overview]
Message-ID: <20200319163910.14733-5-zhengdejin5@gmail.com> (raw)
In-Reply-To: <20200319163910.14733-1-zhengdejin5@gmail.com>

use phy_read_mmd_poll_timeout() to replace the poll codes for
simplify the code in bcm84881_wait_init() function.

Signed-off-by: Dejin Zheng <zhengdejin5@gmail.com>
---
 drivers/net/phy/bcm84881.c | 24 ++++++------------------
 1 file changed, 6 insertions(+), 18 deletions(-)

diff --git a/drivers/net/phy/bcm84881.c b/drivers/net/phy/bcm84881.c
index 14d55a77eb28..c916bd0f6afa 100644
--- a/drivers/net/phy/bcm84881.c
+++ b/drivers/net/phy/bcm84881.c
@@ -22,26 +22,14 @@ enum {
 
 static int bcm84881_wait_init(struct phy_device *phydev)
 {
-	unsigned int tries = 20;
 	int ret, val;
 
-	do {
-		val = phy_read_mmd(phydev, MDIO_MMD_PMAPMD, MDIO_CTRL1);
-		if (val < 0) {
-			ret = val;
-			break;
-		}
-		if (!(val & MDIO_CTRL1_RESET)) {
-			ret = 0;
-			break;
-		}
-		if (!--tries) {
-			ret = -ETIMEDOUT;
-			break;
-		}
-		msleep(100);
-	} while (1);
-
+	ret = phy_read_mmd_poll_timeout(val, val < 0 ||
+					!(val & MDIO_CTRL1_RESET), 100000,
+					2000000, phydev, MDIO_MMD_PMAPMD,
+					MDIO_CTRL1);
+	if (val < 0)
+		ret = val;
 	if (ret)
 		phydev_err(phydev, "%s failed: %d\n", __func__, ret);
 
-- 
2.25.0


  parent reply	other threads:[~2020-03-19 16:40 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-03-19 16:39 [PATCH net-next 0/7] introduce read_poll_timeout Dejin Zheng
2020-03-19 16:39 ` [PATCH net-next 1/7] iopoll: introduce read_poll_timeout macro Dejin Zheng
2020-03-19 16:39 ` [PATCH net-next 2/7] iopoll: redefined readx_poll_timeout macro to simplify the code Dejin Zheng
2020-03-19 16:39 ` [PATCH net-next 3/7] net: phy: introduce phy_read_mmd_poll_timeout macro Dejin Zheng
2020-03-19 16:56   ` Heiner Kallweit
2020-03-19 17:10     ` Andrew Lunn
2020-03-19 16:39 ` Dejin Zheng [this message]
2020-03-19 17:23   ` [PATCH net-next 4/7] net: phy: bcm84881: use phy_read_mmd_poll_timeout() to simplify the code Andrew Lunn
2020-03-19 16:39 ` [PATCH net-next 5/7] net: phy: aquantia: " Dejin Zheng
2020-03-19 16:39 ` [PATCH net-next 6/7] net: phy: introduce phy_read_poll_timeout macro Dejin Zheng
2020-03-19 16:39 ` [PATCH net-next 7/7] net: phy: use phy_read_poll_timeout() to simplify the code Dejin Zheng
2020-03-19 16:42 ` [PATCH net-next 0/7] introduce read_poll_timeout Florian Fainelli
2020-03-20 11:34   ` Dejin Zheng

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=20200319163910.14733-5-zhengdejin5@gmail.com \
    --to=zhengdejin5@gmail.com \
    --cc=andrew@lunn.ch \
    --cc=broonie@kernel.org \
    --cc=corbet@lwn.net \
    --cc=davem@davemloft.net \
    --cc=f.fainelli@gmail.com \
    --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