clk: Don't hold prepare_lock when calling kref_put()

[ Upstream commit 6f63af7511e7058f3fa4ad5b8102210741c9f947 ]

We don't need to hold the prepare_lock when dropping a ref on a struct
clk_core. The release function is only freeing memory and any code with
a pointer reference has already unlinked anything pointing to the
clk_core. This reduces the holding area of the prepare_lock a bit.

Note that we also don't call free_clk() with the prepare_lock held.
There isn't any reason to do that.

Reviewed-by: Douglas Anderson <dianders@chromium.org>
Signed-off-by: Stephen Boyd <sboyd@kernel.org>
Link: https://lore.kernel.org/r/20240325184204.745706-3-sboyd@kernel.org
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c
index cf1fc0edfdbcae03584cb5194ce102fbc79a5bee..260e901d0ba70de94d70679d509975f7965c394f 100644 (file)
--- a/drivers/clk/clk.c
+++ b/drivers/clk/clk.c
@@ -4552,7 +4552,8 @@ void clk_unregister(struct clk *clk)
        if (ops == &clk_nodrv_ops) {
                pr_err("%s: unregistered clock: %s\n", __func__,
                       clk->core->name);
-               goto unlock;
+               clk_prepare_unlock();
+               return;
        }
        /*
         * Assign empty clock ops for consumers that might still hold
@@ -4586,11 +4587,10 @@ void clk_unregister(struct clk *clk)
        if (clk->core->protect_count)
                pr_warn("%s: unregistering protected clock: %s\n",
                                        __func__, clk->core->name);
+       clk_prepare_unlock();
 
        kref_put(&clk->core->ref, __clk_release);
        free_clk(clk);
-unlock:
-       clk_prepare_unlock();
 }
 EXPORT_SYMBOL_GPL(clk_unregister);
 
@@ -4749,13 +4749,11 @@ void __clk_put(struct clk *clk)
        if (clk->min_rate > 0 || clk->max_rate < ULONG_MAX)
                clk_set_rate_range_nolock(clk, 0, ULONG_MAX);
 
-       owner = clk->core->owner;
-       kref_put(&clk->core->ref, __clk_release);
-
        clk_prepare_unlock();
 
+       owner = clk->core->owner;
+       kref_put(&clk->core->ref, __clk_release);
        module_put(owner);
-
        free_clk(clk);
 }