From: Alexandru Ardelean <ardeleanalex@gmail.com>
To: netdev@vger.kernel.org
Cc: Shaohui.Xie@nxp.com, davem@davemloft.net,
Alexandru Ardelean <ardeleanalex@gmail.com>
Subject: [PATCH] net/fsl: remove func xgmac_wait_until_free() as duplicate
Date: Mon, 8 May 2017 14:31:18 +0300 [thread overview]
Message-ID: <1494243078-17917-1-git-send-email-ardeleanalex@gmail.com> (raw)
Looking at xgmac_wait_until_done() and xgmac_wait_until_free()
functions, they seem to have turned out completely identical.
Though, judging from the git history it seems they
initially weren't.
Remove xgmac_wait_until_free() in favor of xgmac_wait_until_done().
Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
---
drivers/net/ethernet/freescale/xgmac_mdio.c | 33 ++++-------------------------
1 file changed, 4 insertions(+), 29 deletions(-)
diff --git a/drivers/net/ethernet/freescale/xgmac_mdio.c b/drivers/net/ethernet/freescale/xgmac_mdio.c
index e03b30c..54597a8 100644
--- a/drivers/net/ethernet/freescale/xgmac_mdio.c
+++ b/drivers/net/ethernet/freescale/xgmac_mdio.c
@@ -71,31 +71,6 @@ static void xgmac_write32(u32 value,
}
/*
- * Wait until the MDIO bus is free
- */
-static int xgmac_wait_until_free(struct device *dev,
- struct tgec_mdio_controller __iomem *regs,
- bool is_little_endian)
-{
- unsigned int timeout;
-
- /* Wait till the bus is free */
- timeout = TIMEOUT;
- while ((xgmac_read32(®s->mdio_stat, is_little_endian) &
- MDIO_STAT_BSY) && timeout) {
- cpu_relax();
- timeout--;
- }
-
- if (!timeout) {
- dev_err(dev, "timeout waiting for bus to be free\n");
- return -ETIMEDOUT;
- }
-
- return 0;
-}
-
-/*
* Wait till the MDIO read or write operation is complete
*/
static int xgmac_wait_until_done(struct device *dev,
@@ -147,7 +122,7 @@ static int xgmac_mdio_write(struct mii_bus *bus, int phy_id, int regnum, u16 val
xgmac_write32(mdio_stat, ®s->mdio_stat, endian);
- ret = xgmac_wait_until_free(&bus->dev, regs, endian);
+ ret = xgmac_wait_until_done(&bus->dev, regs, endian);
if (ret)
return ret;
@@ -159,7 +134,7 @@ static int xgmac_mdio_write(struct mii_bus *bus, int phy_id, int regnum, u16 val
if (regnum & MII_ADDR_C45) {
xgmac_write32(regnum & 0xffff, ®s->mdio_addr, endian);
- ret = xgmac_wait_until_free(&bus->dev, regs, endian);
+ ret = xgmac_wait_until_done(&bus->dev, regs, endian);
if (ret)
return ret;
}
@@ -201,7 +176,7 @@ static int xgmac_mdio_read(struct mii_bus *bus, int phy_id, int regnum)
xgmac_write32(mdio_stat, ®s->mdio_stat, endian);
- ret = xgmac_wait_until_free(&bus->dev, regs, endian);
+ ret = xgmac_wait_until_done(&bus->dev, regs, endian);
if (ret)
return ret;
@@ -213,7 +188,7 @@ static int xgmac_mdio_read(struct mii_bus *bus, int phy_id, int regnum)
if (regnum & MII_ADDR_C45) {
xgmac_write32(regnum & 0xffff, ®s->mdio_addr, endian);
- ret = xgmac_wait_until_free(&bus->dev, regs, endian);
+ ret = xgmac_wait_until_done(&bus->dev, regs, endian);
if (ret)
return ret;
}
--
2.7.4
next reply other threads:[~2017-05-08 11:31 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-08 11:31 Alexandru Ardelean [this message]
2017-05-08 19:34 ` [PATCH] net/fsl: remove func xgmac_wait_until_free() as duplicate David Miller
2017-05-09 6:56 ` Alexandru Ardelean
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=1494243078-17917-1-git-send-email-ardeleanalex@gmail.com \
--to=ardeleanalex@gmail.com \
--cc=Shaohui.Xie@nxp.com \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
/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).