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 06/10] net: phy: marvell10g: use phy_read_mmd_poll_timeout() to simplify the code
Date: Mon, 23 Mar 2020 10:56:29 +0800 [thread overview]
Message-ID: <20200323025633.6069-7-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 mv3310_reset() function.
it should be add msleep(5) before call phy_read_mmd_poll_timeout()
to keep the code more similar, but it will report that warning, so
modify it to msleep(20).
./scripts/checkpatch.pl
v5-0006-net-phy-marvell10g-use-phy_read_mmd_poll_timeout-.patch
WARNING: msleep < 20ms can sleep for up to 20ms; see Documentation/timers/timers-howto.rst
#41: FILE: drivers/net/phy/marvell10g.c:251:
+ msleep(5);
Suggested-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Dejin Zheng <zhengdejin5@gmail.com>
---
v5 -> v6:
- no changed.
v4 -> v5:
- add msleep() to before call phy_read_mmd_poll_timeout()
to keep the code more similar.
v3 -> v4:
- add this patch by Andrew's suggestion. Thanks Andrew!
drivers/net/phy/marvell10g.c | 16 ++++++----------
1 file changed, 6 insertions(+), 10 deletions(-)
diff --git a/drivers/net/phy/marvell10g.c b/drivers/net/phy/marvell10g.c
index 7e05b92504f0..c0fb8391c75b 100644
--- a/drivers/net/phy/marvell10g.c
+++ b/drivers/net/phy/marvell10g.c
@@ -241,22 +241,18 @@ 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;
+ msleep(20);
+ return phy_read_mmd_poll_timeout(phydev, MDIO_MMD_PCS,
+ unit + MDIO_CTRL1, val,
+ !(val & MDIO_CTRL1_RESET),
+ 5000, 80000);
}
static int mv3310_get_edpd(struct phy_device *phydev, u16 *edpd)
--
2.25.0
next prev 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 ` [PATCH net-next v6 05/10] net: phy: aquantia: " Dejin Zheng
2020-03-23 3:20 ` Florian Fainelli
2020-03-23 2:56 ` Dejin Zheng [this message]
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-7-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).