clk: renesas: rzg2l: Convert to readl_poll_timeout_atomic()
authorGeert Uytterhoeven <geert+renesas@glider.be>
Fri, 2 Jun 2023 08:50:40 +0000 (10:50 +0200)
committerGeert Uytterhoeven <geert+renesas@glider.be>
Mon, 5 Jun 2023 13:41:43 +0000 (15:41 +0200)
Use readl_poll_timeout_atomic() instead of open-coding the same
operation.

As typically no retries are needed, 10 µs is a suitable timeout value.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Link: https://lore.kernel.org/r/900543d4b9abc1004e6aecdb676f23e5508ae96f.1685692810.git.geert+renesas@glider.be
drivers/clk/renesas/rzg2l-cpg.c

index ca8b921..bc62351 100644 (file)
@@ -903,9 +903,9 @@ static int rzg2l_mod_clock_endisable(struct clk_hw *hw, bool enable)
        unsigned int reg = clock->off;
        struct device *dev = priv->dev;
        unsigned long flags;
-       unsigned int i;
        u32 bitmask = BIT(clock->bit);
        u32 value;
+       int error;
 
        if (!clock->off) {
                dev_dbg(dev, "%pC does not support ON/OFF\n",  hw->clk);
@@ -930,19 +930,13 @@ static int rzg2l_mod_clock_endisable(struct clk_hw *hw, bool enable)
        if (!priv->info->has_clk_mon_regs)
                return 0;
 
-       for (i = 1000; i > 0; --i) {
-               if (((readl(priv->base + CLK_MON_R(reg))) & bitmask))
-                       break;
-               cpu_relax();
-       }
-
-       if (!i) {
+       error = readl_poll_timeout_atomic(priv->base + CLK_MON_R(reg), value,
+                                         value & bitmask, 0, 10);
+       if (error)
                dev_err(dev, "Failed to enable CLK_ON %p\n",
                        priv->base + CLK_ON_R(reg));
-               return -ETIMEDOUT;
-       }
 
-       return 0;
+       return error;
 }
 
 static int rzg2l_mod_clock_enable(struct clk_hw *hw)