net: dsa: qca8k: use iopoll macro for qca8k_busy_wait

Use iopoll macro instead of while loop.

Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/dsa/qca8k.c b/drivers/net/dsa/qca8k.c
index 0b295da6c356a2ae8aa02d251e3d241004879e6b..25fa7084e820732b8a9715fba762c1e21f2418b9 100644 (file)
--- a/drivers/net/dsa/qca8k.c
+++ b/drivers/net/dsa/qca8k.c
@@ -262,21 +262,20 @@ static struct regmap_config qca8k_regmap_config = {
 static int
 qca8k_busy_wait(struct qca8k_priv *priv, u32 reg, u32 mask)
 {
-       unsigned long timeout;
-
-       timeout = jiffies + msecs_to_jiffies(20);
+       u32 val;
+       int ret;
 
-       /* loop until the busy flag has cleared */
-       do {
-               u32 val = qca8k_read(priv, reg);
-               int busy = val & mask;
+       ret = read_poll_timeout(qca8k_read, val, !(val & mask),
+                               0, QCA8K_BUSY_WAIT_TIMEOUT * USEC_PER_MSEC, false,
+                               priv, reg);
 
-               if (!busy)
-                       break;
-               cond_resched();
-       } while (!time_after_eq(jiffies, timeout));
+       /* Check if qca8k_read has failed for a different reason
+        * before returning -ETIMEDOUT
+        */
+       if (ret < 0 && val < 0)
+               return val;
 
-       return time_after_eq(jiffies, timeout);
+       return ret;
 }
 
 static void

diff --git a/drivers/net/dsa/qca8k.h b/drivers/net/dsa/qca8k.h
index 7ca4b93e0bb5763d2b0d91357785700e63345b26..86c585b7ec4a0768b0487a6f13bfa088513d9dca 100644 (file)
--- a/drivers/net/dsa/qca8k.h
+++ b/drivers/net/dsa/qca8k.h
@@ -18,6 +18,8 @@
 #define PHY_ID_QCA8337                                 0x004dd036
 #define QCA8K_ID_QCA8337                               0x13
 
+#define QCA8K_BUSY_WAIT_TIMEOUT                                20
+
 #define QCA8K_NUM_FDB_RECORDS                          2048
 
 #define QCA8K_CPU_PORT                                 0