From: Jerome Brunet <jbrunet@baylibre.com>
To: Michael Turquette <mturquette@baylibre.com>,
Stephen Boyd <sboyd@kernel.org>
Cc: Jerome Brunet <jbrunet@baylibre.com>,
linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 3/3] clk: add terminate callback to clk_ops
Date: Tue, 24 Sep 2019 14:39:54 +0200 [thread overview]
Message-ID: <20190924123954.31561-4-jbrunet@baylibre.com> (raw)
In-Reply-To: <20190924123954.31561-1-jbrunet@baylibre.com>
Add a terminate callback to the clk_ops to release the resources
claimed in .init()
Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
---
drivers/clk/clk.c | 7 ++++++-
include/linux/clk-provider.h | 3 +++
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c
index df853a98fad2..926f49c78b5d 100644
--- a/drivers/clk/clk.c
+++ b/drivers/clk/clk.c
@@ -3844,6 +3844,7 @@ static void clk_core_evict_parent_cache(struct clk_core *core)
void clk_unregister(struct clk *clk)
{
unsigned long flags;
+ const struct clk_ops *ops;
if (!clk || WARN_ON_ONCE(IS_ERR(clk)))
return;
@@ -3852,7 +3853,8 @@ void clk_unregister(struct clk *clk)
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__,
clk->core->name);
goto unlock;
@@ -3865,6 +3867,9 @@ void clk_unregister(struct clk *clk)
clk->core->ops = &clk_nodrv_ops;
clk_enable_unlock(flags);
+ if (ops->terminate)
+ ops->terminate(clk->core->hw);
+
if (!hlist_empty(&clk->core->children)) {
struct clk_core *child;
struct hlist_node *t;
diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h
index b82ec4c4ca95..5a5a64785923 100644
--- a/include/linux/clk-provider.h
+++ b/include/linux/clk-provider.h
@@ -197,6 +197,8 @@ struct clk_duty {
* such as rate or parents.
* 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
* is called once, after the debugfs directory entry for this
* clock has been created. The dentry pointer representing that
@@ -248,6 +250,7 @@ struct clk_ops {
int (*set_duty_cycle)(struct clk_hw *hw,
struct clk_duty *duty);
int (*init)(struct clk_hw *hw);
+ void (*terminate)(struct clk_hw *hw);
void (*debug_init)(struct clk_hw *hw, struct dentry *dentry);
};
--
2.21.0
next prev parent reply other threads:[~2019-09-24 12:40 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-24 12:39 [PATCH 0/3] clk: let clock perform allocation in init Jerome Brunet
2019-09-24 12:39 ` [PATCH 1/3] clk: actually call the clock init before any other callback of the clock Jerome Brunet
2019-12-24 2:59 ` Stephen Boyd
2019-09-24 12:39 ` [PATCH 2/3] clk: let init callback return an error code Jerome Brunet
2019-09-24 13:38 ` Ankur Tyagi
2019-09-24 14:10 ` Jerome Brunet
2019-09-24 16:19 ` Andrew Lunn
2019-09-29 19:33 ` Heiko Stuebner
2019-09-24 12:39 ` Jerome Brunet [this message]
2019-12-24 2:59 ` [PATCH 3/3] clk: add terminate callback to clk_ops Stephen Boyd
2019-11-18 10:08 ` [PATCH 0/3] clk: let clock perform allocation in init Jerome Brunet
2019-11-29 15:36 ` Jerome Brunet
2019-12-03 9:05 ` Stephen Boyd
2019-12-16 9:17 ` Jerome Brunet
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190924123954.31561-4-jbrunet@baylibre.com \
--to=jbrunet@baylibre.com \
--cc=linux-clk@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mturquette@baylibre.com \
--cc=sboyd@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).