hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

clk: add terminate callback to clk_ops 

Add a terminate callback to the clk_ops to release the resources
claimed in .init()

Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
Link: https://lkml.kernel.org/r/20190924123954.31561-4-jbrunet@baylibre.com
Signed-off-by: Stephen Boyd <sboyd@kernel.org>
This commit is contained in:
Jerome Brunet 2019-09-24 14:39:54 +02:00 committed by Stephen Boyd
parent 89d079dc17
commit f873744c29
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/clk/clk.c
View File

@ -3862,6 +3862,7 @@ static void clk_core_evict_parent_cache(struct clk_core *core)
void clk_unregister(struct clk *clk) void clk_unregister(struct clk *clk)
{ {
unsigned long flags; unsigned long flags;
const struct clk_ops *ops;
if (!clk || WARN_ON_ONCE(IS_ERR(clk))) if (!clk || WARN_ON_ONCE(IS_ERR(clk)))
return; return;
@ -3870,7 +3871,8 @@ void clk_unregister(struct clk *clk)
clk_prepare_lock(); clk_prepare_lock();
if (clk->core->ops == &clk_nodrv_ops) { ops = clk->core->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; goto unlock;
@ -3883,6 +3885,9 @@ void clk_unregister(struct clk *clk)
clk->core->ops = &clk_nodrv_ops; clk->core->ops = &clk_nodrv_ops;
clk_enable_unlock(flags); clk_enable_unlock(flags);
if (ops->terminate)
ops->terminate(clk->core->hw);
if (!hlist_empty(&clk->core->children)) { if (!hlist_empty(&clk->core->children)) {
struct clk_core *child; struct clk_core *child;
struct hlist_node *t; struct hlist_node *t;

3
include/linux/clk-provider.h
View File

@ -197,6 +197,8 @@ struct clk_duty {
* such as rate or parents. * such as rate or parents.
* Returns 0 on success, -EERROR otherwise. * Returns 0 on success, -EERROR otherwise.
* *
* @terminate: Free any resource allocated by init.
*
* @debug_init: Set up type-specific debugfs entries for this clock. This * @debug_init: Set up type-specific debugfs entries for this clock. This
* is called once, after the debugfs directory entry for this * is called once, after the debugfs directory entry for this
* clock has been created. The dentry pointer representing that * clock has been created. The dentry pointer representing that
@ -248,6 +250,7 @@ struct clk_ops {
int (*set_duty_cycle)(struct clk_hw *hw, int (*set_duty_cycle)(struct clk_hw *hw,
struct clk_duty *duty); struct clk_duty *duty);
int (*init)(struct clk_hw *hw); int (*init)(struct clk_hw *hw);
void (*terminate)(struct clk_hw *hw);
void (*debug_init)(struct clk_hw *hw, struct dentry *dentry); void (*debug_init)(struct clk_hw *hw, struct dentry *dentry);
}; };