lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Message-Id: <1494243078-17917-1-git-send-email-ardeleanalex@gmail.com> Date: Mon, 8 May 2017 14:31:18 +0300 From: Alexandru Ardelean <ardeleanalex@...il.com> To: netdev@...r.kernel.org Cc: Shaohui.Xie@....com, davem@...emloft.net, Alexandru Ardelean <ardeleanalex@...il.com> Subject: [PATCH] net/fsl: remove func xgmac_wait_until_free() as duplicate 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@...il.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
Powered by blists - more mailing lists