From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
To: linux-arm-kernel@lists.infradead.org
Cc: linux-kernel@vger.kernel.org,
Russell King <linux@arm.linux.org.uk>,
Mike Turquette <mturquette@ti.com>,
Viresh Kumar <viresh.kumar@linaro.org>
Subject: [PATCH 2/3] CLK: uninline clk_prepare_enable() and clk_disable_unprepare()
Date: Tue, 20 Nov 2012 01:22:18 -0800 [thread overview]
Message-ID: <1353403339-11679-3-git-send-email-dmitry.torokhov@gmail.com> (raw)
In-Reply-To: <1353403339-11679-1-git-send-email-dmitry.torokhov@gmail.com>
We'll need to invoke clk_disable_unprepare() via a pointer in our devm_*
conversion so let's uninline the pair.
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
---
drivers/clk/clk.c | 23 +++++++++++++++++++++++
include/linux/clk.h | 53 +++++++++++++++++++++++++++++++----------------------
2 files changed, 54 insertions(+), 22 deletions(-)
diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c
index 1b642f2..69dc7ba 100644
--- a/drivers/clk/clk.c
+++ b/drivers/clk/clk.c
@@ -561,6 +561,29 @@ int clk_enable(struct clk *clk)
}
EXPORT_SYMBOL_GPL(clk_enable);
+int clk_prepare_enable(struct clk *clk)
+{
+ int ret;
+
+ ret = clk_prepare(clk);
+ if (ret)
+ return ret;
+
+ ret = clk_enable(clk);
+ if (ret)
+ clk_unprepare(clk);
+
+ return ret;
+}
+EXPORT_SYMBOL_GPL(clk_prepare_enable);
+
+void clk_disable_unprepare(struct clk *clk)
+{
+ clk_disable(clk);
+ clk_unprepare(clk);
+}
+EXPORT_SYMBOL_GPL(clk_disable_unprepare);
+
/**
* __clk_round_rate - round the given rate for a clk
* @clk: round the rate of this clock
diff --git a/include/linux/clk.h b/include/linux/clk.h
index f8204c3..8bf149e 100644
--- a/include/linux/clk.h
+++ b/include/linux/clk.h
@@ -172,6 +172,26 @@ int clk_enable(struct clk *clk);
void clk_disable(struct clk *clk);
/**
+ * clk_prepare_enable - prepare and enable a clock source
+ * @clk: clock source
+ *
+ * This prepares the clock source for use and enables it.
+ *
+ * Must not be called from within atomic context.
+ */
+int clk_prepare_enable(struct clk *clk);
+
+/**
+ * clk_disable_unprepare - disable and undo preparation of a clock source
+ * @clk: clock source
+ *
+ * This disables and undoes a previously prepared clock.
+ *
+ * Must not be called from within atomic context.
+ */
+void clk_disable_unprepare(struct clk *clk);
+
+/**
* clk_get_rate - obtain the current clock rate (in Hz) for a clock source.
* This is only valid once the clock source has been enabled.
* @clk: clock source
@@ -295,6 +315,17 @@ static inline int clk_enable(struct clk *clk)
static inline void clk_disable(struct clk *clk) {}
+static inline int clk_prepare_enable(struct clk *clk)
+{
+ might_sleep();
+ return 0;
+}
+
+static inline void clk_disable_unprepare(struct clk *clk)
+{
+ might_sleep();
+}
+
static inline unsigned long clk_get_rate(struct clk *clk)
{
return 0;
@@ -322,28 +353,6 @@ static inline struct clk *clk_get_parent(struct clk *clk)
#endif
-/* clk_prepare_enable helps cases using clk_enable in non-atomic context. */
-static inline int clk_prepare_enable(struct clk *clk)
-{
- int ret;
-
- ret = clk_prepare(clk);
- if (ret)
- return ret;
- ret = clk_enable(clk);
- if (ret)
- clk_unprepare(clk);
-
- return ret;
-}
-
-/* clk_disable_unprepare helps cases using clk_disable in non-atomic context. */
-static inline void clk_disable_unprepare(struct clk *clk)
-{
- clk_disable(clk);
- clk_unprepare(clk);
-}
-
/**
* clk_add_alias - add a new clock alias
* @alias: name for clock alias
--
1.7.11.7
next prev parent reply other threads:[~2012-11-20 9:22 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-20 9:22 [RFC/PATCH 0/3] CLK: add more devm_* APIs Dmitry Torokhov
2012-11-20 9:22 ` [PATCH 1/3] CLK: uninline clk_prepare() and clk_unprepare() Dmitry Torokhov
2012-11-20 9:32 ` Russell King - ARM Linux
2012-11-20 9:40 ` Viresh Kumar
2012-11-20 9:57 ` Dmitry Torokhov
2012-11-20 10:13 ` Viresh Kumar
2012-11-21 20:43 ` Mike Turquette
2012-11-21 20:54 ` Dmitry Torokhov
2012-11-21 22:38 ` Russell King - ARM Linux
2012-11-22 2:17 ` Dmitry Torokhov
2012-11-22 3:11 ` Dmitry Torokhov
2012-11-22 3:24 ` Mike Turquette
2012-11-22 9:31 ` Russell King - ARM Linux
2012-11-22 3:26 ` Viresh Kumar
2012-11-22 9:30 ` Russell King - ARM Linux
2012-11-22 10:03 ` Russell King - ARM Linux
2012-11-22 10:08 ` Viresh Kumar
2012-11-23 7:19 ` Dmitry Torokhov
2012-11-23 7:27 ` Viresh Kumar
2012-11-23 8:08 ` Dmitry Torokhov
2012-11-23 8:43 ` Shawn Guo
2012-11-22 3:34 ` Viresh Kumar
2012-11-22 4:05 ` Mike Turquette
2012-11-20 9:22 ` Dmitry Torokhov [this message]
2012-11-20 9:35 ` [PATCH 2/3] CLK: uninline clk_prepare_enable() and clk_disable_unprepare() Russell King - ARM Linux
2012-11-20 10:18 ` Viresh Kumar
2012-12-16 11:40 ` Viresh Kumar
2012-12-16 11:41 ` Viresh Kumar
2012-12-16 11:57 ` Russell King - ARM Linux
2012-12-16 12:20 ` Viresh Kumar
2012-12-16 12:40 ` Russell King - ARM Linux
2012-12-16 13:05 ` Viresh Kumar
2012-12-16 13:09 ` Russell King - ARM Linux
2012-12-17 5:42 ` Dmitry Torokhov
2013-04-08 10:19 ` Viresh Kumar
2014-01-13 14:06 ` Andy Shevchenko
2012-11-20 9:22 ` [PATCH 3/3] CLK: add more managed APIs Dmitry Torokhov
2012-11-20 10:05 ` Viresh Kumar
2012-11-20 9:34 ` [RFC/PATCH 0/3] CLK: add more devm_* APIs Russell King - ARM Linux
2012-11-20 9:53 ` Dmitry Torokhov
2012-11-22 5:34 ` [PATCH v2 " Dmitry Torokhov
2012-11-22 5:34 ` [PATCH v2 1/3] CLK: get rid of HAVE_CLK_PREPARE Dmitry Torokhov
2012-11-22 6:12 ` Shawn Guo
2012-11-22 9:54 ` Russell King - ARM Linux
2012-11-22 5:34 ` [PATCH v2 2/3] CLK: uninline clk_prepare_enable() and clk_disable_unprepare() Dmitry Torokhov
2012-11-22 5:34 ` [PATCH v2 3/3] CLK: add more managed APIs Dmitry Torokhov
2017-01-02 18:09 ` [v2,3/3] " Guenter Roeck
2012-11-22 5:47 ` [PATCH v2 0/3] CLK: add more devm_* APIs Viresh Kumar
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=1353403339-11679-3-git-send-email-dmitry.torokhov@gmail.com \
--to=dmitry.torokhov@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=mturquette@ti.com \
--cc=viresh.kumar@linaro.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).