| Message ID | 20200324112647.27237-1-zhengdejin5@gmail.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | c9c1fd62b0ed32127d6af8409ae3ad0e9be70590 |
| Headers | show |
| Series | [net-next] net: phy: mdio-mux-bcm-iproc: use readl_poll_timeout() to simplify code | expand |
On Tue, Mar 24, 2020 at 07:26:47PM +0800, Dejin Zheng wrote: > use readl_poll_timeout() to replace the poll codes for simplify > iproc_mdio_wait_for_idle() function > > Signed-off-by: Dejin Zheng <zhengdejin5@gmail.com> Reviewed-by: Andrew Lunn <andrew@lunn.ch> Andrew
From: Dejin Zheng <zhengdejin5@gmail.com> Date: Tue, 24 Mar 2020 19:26:47 +0800 > use readl_poll_timeout() to replace the poll codes for simplify > iproc_mdio_wait_for_idle() function > > Signed-off-by: Dejin Zheng <zhengdejin5@gmail.com> Applied, thanks.
diff --git a/drivers/net/phy/mdio-mux-bcm-iproc.c b/drivers/net/phy/mdio-mux-bcm-iproc.c index aad6809ebe39..42fb5f166136 100644 --- a/drivers/net/phy/mdio-mux-bcm-iproc.c +++ b/drivers/net/phy/mdio-mux-bcm-iproc.c @@ -10,6 +10,7 @@ #include <linux/phy.h> #include <linux/mdio-mux.h> #include <linux/delay.h> +#include <linux/iopoll.h> #define MDIO_RATE_ADJ_EXT_OFFSET 0x000 #define MDIO_RATE_ADJ_INT_OFFSET 0x004 @@ -78,18 +79,11 @@ static void mdio_mux_iproc_config(struct iproc_mdiomux_desc *md) static int iproc_mdio_wait_for_idle(void __iomem *base, bool result) { - unsigned int timeout = 1000; /* loop for 1s */ u32 val; - do { - val = readl(base + MDIO_STAT_OFFSET); - if ((val & MDIO_STAT_DONE) == result) - return 0; - - usleep_range(1000, 2000); - } while (timeout--); - - return -ETIMEDOUT; + return readl_poll_timeout(base + MDIO_STAT_OFFSET, val, + (val & MDIO_STAT_DONE) == result, + 2000, 1000000); } /* start_miim_ops- Program and start MDIO transaction over mdio bus.
use readl_poll_timeout() to replace the poll codes for simplify iproc_mdio_wait_for_idle() function Signed-off-by: Dejin Zheng <zhengdejin5@gmail.com> --- drivers/net/phy/mdio-mux-bcm-iproc.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-)