From: Mark Brown <broonie@opensource.wolfsonmicro.com>
To: Russell King <linux@arm.linux.org.uk>,
Mike Turquette <mturquette@ti.com>
Cc: linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org,
Mark Brown <broonie@opensource.wolfsonmicro.com>
Subject: [PATCH 2/2] clkdev: Implement managed clk_get()
Date: Sun, 1 Apr 2012 12:32:40 +0100 [thread overview]
Message-ID: <1333279960-8497-2-git-send-email-broonie@opensource.wolfsonmicro.com> (raw)
In-Reply-To: <1333279960-8497-1-git-send-email-broonie@opensource.wolfsonmicro.com>
Allow clk API users to simplify their cleanup paths by providing a
managed version of clk_get().
Due to the lack of a standard struct clk to look up the device from a
managed clk_put() is not provided, it would be very unusual to use this
function so it's not a big loss.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
---
Documentation/driver-model/devres.txt | 3 +++
drivers/clk/clkdev.c | 25 +++++++++++++++++++++++++
include/linux/clk.h | 20 ++++++++++++++++++++
3 files changed, 48 insertions(+), 0 deletions(-)
diff --git a/Documentation/driver-model/devres.txt b/Documentation/driver-model/devres.txt
index 2a596a4..3a10848 100644
--- a/Documentation/driver-model/devres.txt
+++ b/Documentation/driver-model/devres.txt
@@ -276,3 +276,6 @@ REGULATOR
devm_regulator_get()
devm_regulator_put()
devm_regulator_bulk_get()
+
+CLOCK
+ devm_clk_get()
diff --git a/drivers/clk/clkdev.c b/drivers/clk/clkdev.c
index 6db161f..8af1d2c 100644
--- a/drivers/clk/clkdev.c
+++ b/drivers/clk/clkdev.c
@@ -89,6 +89,31 @@ void clk_put(struct clk *clk)
}
EXPORT_SYMBOL(clk_put);
+static void devm_clk_release(struct device *dev, void *res)
+{
+ clk_put(*(struct clk **)res);
+}
+
+struct clk *devm_clk_get(struct device *dev, const char *id)
+{
+ struct clk **ptr, *clk;
+
+ ptr = devres_alloc(devm_clk_release, sizeof(*ptr), GFP_KERNEL);
+ if (!ptr)
+ return ERR_PTR(-ENOMEM);
+
+ clk = clk_get(dev, id);
+ if (!IS_ERR(clk)) {
+ *ptr = clk;
+ devres_add(dev, ptr);
+ } else {
+ devres_free(ptr);
+ }
+
+ return clk;
+}
+EXPORT_SYMBOL_GPL(devm_clk_get);
+
void clkdev_add(struct clk_lookup *cl)
{
mutex_lock(&clocks_mutex);
diff --git a/include/linux/clk.h b/include/linux/clk.h
index 4b27d15..fd96e4a 100644
--- a/include/linux/clk.h
+++ b/include/linux/clk.h
@@ -101,6 +101,26 @@ int clk_notifier_unregister(struct clk *clk, struct notifier_block *nb);
struct clk *clk_get(struct device *dev, const char *id);
/**
+ * devm_clk_get - lookup and obtain a managed reference to a clock producer.
+ * @dev: device for clock "consumer"
+ * @id: clock comsumer ID
+ *
+ * Returns a struct clk corresponding to the clock producer, or
+ * valid IS_ERR() condition containing errno. The implementation
+ * uses @dev and @id to determine the clock consumer, and thereby
+ * the clock producer. (IOW, @id may be identical strings, but
+ * clk_get may return different clock producers depending on @dev.)
+ *
+ * Drivers must assume that the clock source is not enabled.
+ *
+ * devm_clk_get should not be called from within interrupt context.
+ *
+ * The clock will automatically be freed when the device is unbound
+ * from the bus.
+ */
+struct clk *devm_clk_get(struct device *dev, const char *id);
+
+/**
* clk_prepare - prepare a clock source
* @clk: clock source
*
--
1.7.9.1
next prev parent reply other threads:[~2012-04-01 11:33 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-01 11:32 [PATCH 1/2] clk: Fix comment for end of CONFIG_COMMON_CLK section Mark Brown
2012-04-01 11:32 ` Mark Brown [this message]
2012-04-01 15:26 ` [PATCH 2/2] clkdev: Implement managed clk_get() Stephen Boyd
2012-04-01 15:34 ` Mark Brown
2012-04-02 16:48 ` Stephen Boyd
2012-04-02 16:52 ` Russell King - ARM Linux
2012-04-02 17:04 ` Stephen Boyd
2012-04-02 17:08 ` Russell King - ARM Linux
2012-04-02 17:16 ` Stephen Boyd
2012-04-02 17:21 ` Russell King - ARM Linux
2012-04-02 17:34 ` Stephen Boyd
2012-04-02 18:02 ` Russell King - ARM Linux
2012-04-02 17:16 ` Mark Brown
2012-04-02 17:30 ` Turquette, Mike
2012-04-02 17:04 ` Russell King - ARM Linux
2012-04-02 17:34 ` Mark Brown
2012-04-02 18:05 ` Russell King - ARM Linux
2012-04-01 13:02 ` [PATCH 1/2] clk: Fix comment for end of CONFIG_COMMON_CLK section Russell King - ARM Linux
2012-04-01 14:29 ` Mark Brown
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=1333279960-8497-2-git-send-email-broonie@opensource.wolfsonmicro.com \
--to=broonie@opensource.wolfsonmicro.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=mturquette@ti.com \
/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).