clk: use clk_core_enable_lock() a bit more

Use clk_core_enable_lock() and clk_core_disable_lock() in a few places
rather than open-coding them.

Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Link: https://lore.kernel.org/r/20210305003334.575831-1-linux@rasmusvillemoes.dk
Signed-off-by: Stephen Boyd <sboyd@kernel.org>

diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c
index 5052541..8c1ed84 100644 (file)
--- a/drivers/clk/clk.c
+++ b/drivers/clk/clk.c
@@ -2078,12 +2078,8 @@ static void clk_change_rate(struct clk_core *core)
                return;
 
        if (core->flags & CLK_SET_RATE_UNGATE) {
-               unsigned long flags;
-
                clk_core_prepare(core);
-               flags = clk_enable_lock();
-               clk_core_enable(core);
-               clk_enable_unlock(flags);
+               clk_core_enable_lock(core);
        }
 
        if (core->new_parent && core->new_parent != core->parent) {
@@ -2116,11 +2112,7 @@ static void clk_change_rate(struct clk_core *core)
        core->rate = clk_recalc(core, best_parent_rate);
 
        if (core->flags & CLK_SET_RATE_UNGATE) {
-               unsigned long flags;
-
-               flags = clk_enable_lock();
-               clk_core_disable(core);
-               clk_enable_unlock(flags);
+               clk_core_disable_lock(core);
                clk_core_unprepare(core);
        }
 
@@ -3564,8 +3556,6 @@ static int __clk_core_init(struct clk_core *core)
         * reparenting clocks
         */
        if (core->flags & CLK_IS_CRITICAL) {
-               unsigned long flags;
-
                ret = clk_core_prepare(core);
                if (ret) {
                        pr_warn("%s: critical clk '%s' failed to prepare\n",
@@ -3573,9 +3563,7 @@ static int __clk_core_init(struct clk_core *core)
                        goto out;
                }
 
-               flags = clk_enable_lock();
-               ret = clk_core_enable(core);
-               clk_enable_unlock(flags);
+               ret = clk_core_enable_lock(core);
                if (ret) {
                        pr_warn("%s: critical clk '%s' failed to enable\n",
                               __func__, core->name);