From: Justin Chen Date: Wed, 13 Dec 2023 22:27:44 +0000 (-0800) Subject: net: mdio: mdio-bcm-unimac: Use read_poll_timeout X-Git-Tag: v6.8-rc1~131^2~146^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=54a600ed217036f231805703cedd9f8f98d3f40a;p=thirdparty%2Fkernel%2Flinux.git net: mdio: mdio-bcm-unimac: Use read_poll_timeout Simplify the code by using read_poll_timeout(). Signed-off-by: Justin Chen Reviewed-by: Andrew Lunn Link: https://lore.kernel.org/r/20231213222744.2891184-3-justin.chen@broadcom.com Signed-off-by: Jakub Kicinski --- diff --git a/drivers/net/mdio/mdio-bcm-unimac.c b/drivers/net/mdio/mdio-bcm-unimac.c index 297ea4a58d799..68f8ee0ec8baa 100644 --- a/drivers/net/mdio/mdio-bcm-unimac.c +++ b/drivers/net/mdio/mdio-bcm-unimac.c @@ -73,15 +73,10 @@ static inline void unimac_mdio_start(struct unimac_mdio_priv *priv) unimac_mdio_writel(priv, reg, MDIO_CMD); } -static inline unsigned int unimac_mdio_busy(struct unimac_mdio_priv *priv) -{ - return unimac_mdio_readl(priv, MDIO_CMD) & MDIO_START_BUSY; -} - static int unimac_mdio_poll(void *wait_func_data) { struct unimac_mdio_priv *priv = wait_func_data; - unsigned int timeout = 100; + u32 val; /* * C22 transactions should take ~25 usec, will need to adjust @@ -89,14 +84,8 @@ static int unimac_mdio_poll(void *wait_func_data) */ udelay(30); - do { - if (!unimac_mdio_busy(priv)) - return 0; - - usleep_range(1000, 2000); - } while (--timeout); - - return -ETIMEDOUT; + return read_poll_timeout(unimac_mdio_readl, val, !(val & MDIO_START_BUSY), + 2000, 100000, false, priv, MDIO_CMD); } static int unimac_mdio_read(struct mii_bus *bus, int phy_id, int reg)