From: Marc Gonzalez <marc.w.gonzalez@free.fr>
To: Stephen Boyd <sboyd@kernel.org>,
Michael Turquette <mturquette@baylibre.com>
Cc: linux-clk <linux-clk@vger.kernel.org>,
LKML <linux-kernel@vger.kernel.org>,
"Jonathan Neuschäfer" <j.neuschaefer@gmx.net>,
"Bjorn Andersson" <bjorn.andersson@linaro.org>,
"Guenter Roeck" <linux@roeck-us.net>
Subject: [PATCH v1] clk: Add devm_clk_{prepare,enable,prepare_enable}
Date: Mon, 15 Jul 2019 17:34:32 +0200 [thread overview]
Message-ID: <1d7a1b3b-e9bf-1d80-609d-a9c0c932b15a@free.fr> (raw)
Provide devm variants for automatic resource release on device removal.
probe() error-handling is simpler, and remove is no longer required.
Signed-off-by: Marc Gonzalez <marc.w.gonzalez@free.fr>
---
Documentation/driver-model/devres.rst | 3 +++
drivers/clk/clk.c | 24 ++++++++++++++++++++++++
include/linux/clk.h | 8 ++++++++
3 files changed, 35 insertions(+)
diff --git a/Documentation/driver-model/devres.rst b/Documentation/driver-model/devres.rst
index 1b6ced8e4294..9357260576ef 100644
--- a/Documentation/driver-model/devres.rst
+++ b/Documentation/driver-model/devres.rst
@@ -253,6 +253,9 @@ CLOCK
devm_clk_hw_register()
devm_of_clk_add_hw_provider()
devm_clk_hw_register_clkdev()
+ devm_clk_prepare()
+ devm_clk_enable()
+ devm_clk_prepare_enable()
DMA
dmaenginem_async_device_register()
diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c
index c0990703ce54..5e85548357c0 100644
--- a/drivers/clk/clk.c
+++ b/drivers/clk/clk.c
@@ -914,6 +914,18 @@ int clk_prepare(struct clk *clk)
}
EXPORT_SYMBOL_GPL(clk_prepare);
+static void unprepare(void *clk)
+{
+ clk_unprepare(clk);
+}
+
+int devm_clk_prepare(struct device *dev, struct clk *clk)
+{
+ int rc = clk_prepare(clk);
+ return rc ? : devm_add_action_or_reset(dev, unprepare, clk);
+}
+EXPORT_SYMBOL_GPL(devm_clk_prepare);
+
static void clk_core_disable(struct clk_core *core)
{
lockdep_assert_held(&enable_lock);
@@ -1136,6 +1148,18 @@ int clk_enable(struct clk *clk)
}
EXPORT_SYMBOL_GPL(clk_enable);
+static void disable(void *clk)
+{
+ clk_disable(clk);
+}
+
+int devm_clk_enable(struct device *dev, struct clk *clk)
+{
+ int rc = clk_enable(clk);
+ return rc ? : devm_add_action_or_reset(dev, disable, clk);
+}
+EXPORT_SYMBOL_GPL(devm_clk_enable);
+
static int clk_core_prepare_enable(struct clk_core *core)
{
int ret;
diff --git a/include/linux/clk.h b/include/linux/clk.h
index 3c096c7a51dc..d09b5207e3f1 100644
--- a/include/linux/clk.h
+++ b/include/linux/clk.h
@@ -895,6 +895,14 @@ static inline void clk_restore_context(void) {}
#endif
+int devm_clk_prepare(struct device *dev, struct clk *clk);
+int devm_clk_enable(struct device *dev, struct clk *clk);
+static inline int devm_clk_prepare_enable(struct device *dev, struct clk *clk)
+{
+ int rc = devm_clk_prepare(dev, clk);
+ return rc ? : devm_clk_enable(dev, clk);
+}
+
/* clk_prepare_enable helps cases using clk_enable in non-atomic context. */
static inline int clk_prepare_enable(struct clk *clk)
{
--
2.17.1
next reply other threads:[~2019-07-15 15:34 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-15 15:34 Marc Gonzalez [this message]
2019-07-15 21:46 ` [PATCH v1] clk: Add devm_clk_{prepare,enable,prepare_enable} Bjorn Andersson
2019-11-25 13:50 ` Marc Gonzalez
2019-07-16 0:25 ` Guenter Roeck
2019-07-16 8:18 ` Marc Gonzalez
2019-08-20 8:46 ` Marc Gonzalez
2019-11-25 12:46 ` Marc Gonzalez
2019-11-25 12:51 ` Marc Gonzalez
2019-11-25 12:52 ` Russell King - ARM Linux admin
2019-11-25 13:16 ` Marc Gonzalez
2019-11-25 13:31 ` Russell King - ARM Linux admin
2019-11-25 13:34 ` Marc Gonzalez
2019-11-25 13:38 ` Russell King - ARM Linux admin
2019-11-25 12:55 ` Russell King - ARM Linux admin
2019-11-25 13:10 ` Marc Gonzalez
2019-11-25 13:37 ` Russell King - ARM Linux admin
2019-11-25 14:11 ` Marc Gonzalez
2019-11-25 20:43 ` Geert Uytterhoeven
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=1d7a1b3b-e9bf-1d80-609d-a9c0c932b15a@free.fr \
--to=marc.w.gonzalez@free.fr \
--cc=bjorn.andersson@linaro.org \
--cc=j.neuschaefer@gmx.net \
--cc=linux-clk@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@roeck-us.net \
--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).