mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-06 16:49:22 +00:00
clk: Don't hold prepare_lock when calling kref_put()
[ Upstream commit 6f63af7511
]
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>
This commit is contained in:
parent
ac259d3fa3
commit
427ede2813
1 changed files with 5 additions and 7 deletions
|
@ -4523,7 +4523,8 @@ void clk_unregister(struct clk *clk)
|
||||||
if (ops == &clk_nodrv_ops) {
|
if (ops == &clk_nodrv_ops) {
|
||||||
pr_err("%s: unregistered clock: %s\n", __func__,
|
pr_err("%s: unregistered clock: %s\n", __func__,
|
||||||
clk->core->name);
|
clk->core->name);
|
||||||
goto unlock;
|
clk_prepare_unlock();
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
/*
|
/*
|
||||||
* Assign empty clock ops for consumers that might still hold
|
* Assign empty clock ops for consumers that might still hold
|
||||||
|
@ -4557,11 +4558,10 @@ void clk_unregister(struct clk *clk)
|
||||||
if (clk->core->protect_count)
|
if (clk->core->protect_count)
|
||||||
pr_warn("%s: unregistering protected clock: %s\n",
|
pr_warn("%s: unregistering protected clock: %s\n",
|
||||||
__func__, clk->core->name);
|
__func__, clk->core->name);
|
||||||
|
clk_prepare_unlock();
|
||||||
|
|
||||||
kref_put(&clk->core->ref, __clk_release);
|
kref_put(&clk->core->ref, __clk_release);
|
||||||
free_clk(clk);
|
free_clk(clk);
|
||||||
unlock:
|
|
||||||
clk_prepare_unlock();
|
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL_GPL(clk_unregister);
|
EXPORT_SYMBOL_GPL(clk_unregister);
|
||||||
|
|
||||||
|
@ -4720,13 +4720,11 @@ void __clk_put(struct clk *clk)
|
||||||
if (clk->min_rate > 0 || clk->max_rate < ULONG_MAX)
|
if (clk->min_rate > 0 || clk->max_rate < ULONG_MAX)
|
||||||
clk_set_rate_range_nolock(clk, 0, 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();
|
clk_prepare_unlock();
|
||||||
|
|
||||||
|
owner = clk->core->owner;
|
||||||
|
kref_put(&clk->core->ref, __clk_release);
|
||||||
module_put(owner);
|
module_put(owner);
|
||||||
|
|
||||||
free_clk(clk);
|
free_clk(clk);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue