From f5112c8ae22f8d5796b10d9f5db0014b3546dd00 Mon Sep 17 00:00:00 2001 From: Antoine Tenart Date: Tue, 26 May 2020 18:22:54 +0200 Subject: net: phy: mscc-miim: remove redundant timeout check readl_poll_timeout already returns -ETIMEDOUT if the condition isn't satisfied, there's no need to check again the condition after calling it. Remove the redundant timeout check. Signed-off-by: Antoine Tenart Reviewed-by: Alexandre Belloni Reviewed-by: Florian Fainelli Signed-off-by: David S. Miller --- drivers/net/phy/mdio-mscc-miim.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/net/phy/mdio-mscc-miim.c b/drivers/net/phy/mdio-mscc-miim.c index 0b7544f593fb..42119f661452 100644 --- a/drivers/net/phy/mdio-mscc-miim.c +++ b/drivers/net/phy/mdio-mscc-miim.c @@ -43,12 +43,8 @@ static int mscc_miim_wait_ready(struct mii_bus *bus) struct mscc_miim_dev *miim = bus->priv; u32 val; - readl_poll_timeout(miim->regs + MSCC_MIIM_REG_STATUS, val, - !(val & MSCC_MIIM_STATUS_STAT_BUSY), 50, 10000); - if (val & MSCC_MIIM_STATUS_STAT_BUSY) - return -ETIMEDOUT; - - return 0; + return readl_poll_timeout(miim->regs + MSCC_MIIM_REG_STATUS, val, + !(val & MSCC_MIIM_STATUS_STAT_BUSY), 50, 10000); } static int mscc_miim_read(struct mii_bus *bus, int mii_id, int regnum) -- cgit v1.2.3