From: Dejin Zheng <zhengdejin5@gmail.com>
To: andrew@lunn.ch, f.fainelli@gmail.com, hkallweit1@gmail.com,
linux@armlinux.org.uk, davem@davemloft.net, allison@lohutok.net,
tglx@linutronix.de, gregkh@linuxfoundation.org,
mchehab+samsung@kernel.org, netdev@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, Dejin Zheng <zhengdejin5@gmail.com>
Subject: [PATCH net-next v3 4/7] net: phy: bcm84881: use phy_read_mmd_poll_timeout() to simplify the code
Date: Sun, 22 Mar 2020 10:48:31 +0800 [thread overview]
Message-ID: <20200322024834.31402-5-zhengdejin5@gmail.com> (raw)
In-Reply-To: <20200322024834.31402-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>
---
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/bcm84881.c | 27 ++++-----------------------
1 file changed, 4 insertions(+), 23 deletions(-)
diff --git a/drivers/net/phy/bcm84881.c b/drivers/net/phy/bcm84881.c
index 14d55a77eb28..b70be775909c 100644
--- a/drivers/net/phy/bcm84881.c
+++ b/drivers/net/phy/bcm84881.c
@@ -22,30 +22,11 @@ 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);
+ int val;
- if (ret)
- phydev_err(phydev, "%s failed: %d\n", __func__, ret);
-
- return ret;
+ return phy_read_mmd_poll_timeout(phydev, MDIO_MMD_PMAPMD, MDIO_CTRL1,
+ val, !(val & MDIO_CTRL1_RESET),
+ 100000, 2000000);
}
static int bcm84881_config_init(struct phy_device *phydev)
--
2.25.0
next prev parent reply other threads:[~2020-03-22 2:49 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-22 2:48 [PATCH net-next v3 0/7] introduce read_poll_timeout Dejin Zheng
2020-03-22 2:48 ` [PATCH net-next v3 1/7] iopoll: introduce read_poll_timeout macro Dejin Zheng
2020-03-22 2:48 ` [PATCH net-next v3 2/7] iopoll: redefined readx_poll_timeout macro to simplify the code Dejin Zheng
2020-03-22 2:48 ` [PATCH net-next v3 3/7] net: phy: introduce phy_read_mmd_poll_timeout macro Dejin Zheng
2020-03-22 2:48 ` Dejin Zheng [this message]
2020-03-22 2:48 ` [PATCH net-next v3 5/7] net: phy: aquantia: use phy_read_mmd_poll_timeout() to simplify the code Dejin Zheng
2020-03-22 2:48 ` [PATCH net-next v3 6/7] net: phy: introduce phy_read_poll_timeout macro Dejin Zheng
2020-03-22 2:48 ` [PATCH net-next v3 7/7] net: phy: use phy_read_poll_timeout() to simplify the code Dejin Zheng
2020-03-22 2:57 ` Florian Fainelli
2020-03-22 6:12 ` 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=20200322024834.31402-5-zhengdejin5@gmail.com \
--to=zhengdejin5@gmail.com \
--cc=allison@lohutok.net \
--cc=andrew@lunn.ch \
--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