]> git.baikalelectronics.ru Git - kernel.git/commitdiff
net: phy: mscc-miim: remove redundant timeout check
authorAntoine Tenart <antoine.tenart@bootlin.com>
Tue, 26 May 2020 16:22:54 +0000 (18:22 +0200)
committerDavid S. Miller <davem@davemloft.net>
Tue, 26 May 2020 22:33:56 +0000 (15:33 -0700)
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 <antoine.tenart@bootlin.com>
Reviewed-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/phy/mdio-mscc-miim.c

index 0b7544f593fbf1e5b239a1bbc71a15f48a2be8f1..42119f661452b2abfbb44dcdb98bccb3fb3fdd90 100644 (file)
@@ -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)