[PATCH 1/9] soundwire: intel: reuse code for wait loops to set/clear bits

[Bard Liao]

From: Pierre-Louis Bossart <pierre-louis.boss...@linux.intel.com>

Refactor code and use same routines on set/clear

Signed-off-by: Pierre-Louis Bossart <pierre-louis.boss...@linux.intel.com>
Signed-off-by: Bard Liao <yung-chuan.l...@linux.intel.com>
---
 drivers/soundwire/intel.c | 45 +++++++++++++++++----------------------
 1 file changed, 19 insertions(+), 26 deletions(-)

diff --git a/drivers/soundwire/intel.c b/drivers/soundwire/intel.c
index 7a65414e5714..8c7ae07c0fe1 100644
--- a/drivers/soundwire/intel.c
+++ b/drivers/soundwire/intel.c
@@ -123,40 +123,33 @@ static inline void intel_writew(void __iomem *base, int 
offset, u16 value)
        writew(value, base + offset);
 }
 
+static int intel_wait_bit(void __iomem *base, int offset, u32 mask, u32 target)
+{
+       int timeout = 10;
+       u32 reg_read;
+
+       do {
+               reg_read = readl(base + offset);
+               if ((reg_read & mask) == target)
+                       return 0;
+
+               timeout--;
+               usleep_range(50, 100);
+       } while (timeout != 0);
+
+       return -EAGAIN;
+}
+
 static int intel_clear_bit(void __iomem *base, int offset, u32 value, u32 mask)
 {
-       int timeout = 10;
-       u32 reg_read;
-
        writel(value, base + offset);
-       do {
-               reg_read = readl(base + offset);
-               if (!(reg_read & mask))
-                       return 0;
-
-               timeout--;
-               udelay(50);
-       } while (timeout != 0);
-
-       return -EAGAIN;
+       return intel_wait_bit(base, offset, mask, 0);
 }
 
 static int intel_set_bit(void __iomem *base, int offset, u32 value, u32 mask)
 {
-       int timeout = 10;
-       u32 reg_read;
-
        writel(value, base + offset);
-       do {
-               reg_read = readl(base + offset);
-               if (reg_read & mask)
-                       return 0;
-
-               timeout--;
-               udelay(50);
-       } while (timeout != 0);
-
-       return -EAGAIN;
+       return intel_wait_bit(base, offset, mask, mask);
 }
 
 /*
-- 
2.17.1