[alsa-devel] [PATCH v3] clkdev: add devm_of_clk_get()
From: Kuninori Morimoto kuninori.morimoto.gx@renesas.com
Current Linux has of_clk_get(), but doesn't have devm_of_clk_get(). This patch adds it.
Signed-off-by: Kuninori Morimoto kuninori.morimoto.gx@renesas.com --- v2 -> v3
- implement in clk-devres.c, and reused existing devm_clk_release()
drivers/clk/clk-devres.c | 21 +++++++++++++++++++++ include/linux/clk.h | 7 +++++++ 2 files changed, 28 insertions(+)
diff --git a/drivers/clk/clk-devres.c b/drivers/clk/clk-devres.c index 8f57154..2449b25 100644 --- a/drivers/clk/clk-devres.c +++ b/drivers/clk/clk-devres.c @@ -53,3 +53,24 @@ void devm_clk_put(struct device *dev, struct clk *clk) WARN_ON(ret); } EXPORT_SYMBOL(devm_clk_put); + +struct clk *devm_of_clk_get(struct device *dev, + struct device_node *np, int index) +{ + struct clk **ptr, *clk; + + ptr = devres_alloc(devm_clk_release, sizeof(*ptr), GFP_KERNEL); + if (!ptr) + return ERR_PTR(-ENOMEM); + + clk = of_clk_get(np, index); + if (!IS_ERR(clk)) { + *ptr = clk; + devres_add(dev, ptr); + } else { + devres_free(ptr); + } + + return clk; +} +EXPORT_SYMBOL(devm_of_clk_get); diff --git a/include/linux/clk.h b/include/linux/clk.h index 123c027..1b713db 100644 --- a/include/linux/clk.h +++ b/include/linux/clk.h @@ -506,6 +506,8 @@ static inline void clk_disable_unprepare(struct clk *clk)
#if defined(CONFIG_OF) && defined(CONFIG_COMMON_CLK) struct clk *of_clk_get(struct device_node *np, int index); +struct clk *devm_of_clk_get(struct device *dev, + struct device_node *np, int index); struct clk *of_clk_get_by_name(struct device_node *np, const char *name); struct clk *of_clk_get_from_provider(struct of_phandle_args *clkspec); #else @@ -513,6 +515,11 @@ static inline struct clk *of_clk_get(struct device_node *np, int index) { return ERR_PTR(-ENOENT); } +static inline struct clk *devm_of_clk_get(struct device *dev, + struct device_node *np, int index) +{ + return ERR_PTR(-ENOENT); +} static inline struct clk *of_clk_get_by_name(struct device_node *np, const char *name) {
On Mon, Nov 28, 2016 at 09:32:51AM +0000, Kuninori Morimoto wrote:
From: Kuninori Morimoto kuninori.morimoto.gx@renesas.com
Current Linux has of_clk_get(), but doesn't have devm_of_clk_get(). This patch adds it.
Signed-off-by: Kuninori Morimoto kuninori.morimoto.gx@renesas.com
v2 -> v3
- implement in clk-devres.c, and reused existing devm_clk_release()
drivers/clk/clk-devres.c | 21 +++++++++++++++++++++ include/linux/clk.h | 7 +++++++ 2 files changed, 28 insertions(+)
diff --git a/drivers/clk/clk-devres.c b/drivers/clk/clk-devres.c index 8f57154..2449b25 100644 --- a/drivers/clk/clk-devres.c +++ b/drivers/clk/clk-devres.c @@ -53,3 +53,24 @@ void devm_clk_put(struct device *dev, struct clk *clk) WARN_ON(ret); } EXPORT_SYMBOL(devm_clk_put);
+struct clk *devm_of_clk_get(struct device *dev,
struct device_node *np, int index)+{
- struct clk **ptr, *clk;
- ptr = devres_alloc(devm_clk_release, sizeof(*ptr), GFP_KERNEL);
- if (!ptr)
return ERR_PTR(-ENOMEM);- clk = of_clk_get(np, index);
- if (!IS_ERR(clk)) {
*ptr = clk;devres_add(dev, ptr);- } else {
devres_free(ptr);- }
- return clk;
+} +EXPORT_SYMBOL(devm_of_clk_get); diff --git a/include/linux/clk.h b/include/linux/clk.h index 123c027..1b713db 100644 --- a/include/linux/clk.h +++ b/include/linux/clk.h @@ -506,6 +506,8 @@ static inline void clk_disable_unprepare(struct clk *clk)
#if defined(CONFIG_OF) && defined(CONFIG_COMMON_CLK) struct clk *of_clk_get(struct device_node *np, int index); +struct clk *devm_of_clk_get(struct device *dev,
struct device_node *np, int index);
No need for this to be within the ifdef.
struct clk *of_clk_get_by_name(struct device_node *np, const char *name); struct clk *of_clk_get_from_provider(struct of_phandle_args *clkspec); #else @@ -513,6 +515,11 @@ static inline struct clk *of_clk_get(struct device_node *np, int index) { return ERR_PTR(-ENOENT); } +static inline struct clk *devm_of_clk_get(struct device *dev,
struct device_node *np, int index)+{
- return ERR_PTR(-ENOENT);
+}
and so no need for this either. In any case, this will cause !OF || !COMMON_CLK builds to fail because this definition will conflict with that in clk-devres.c
static inline struct clk *of_clk_get_by_name(struct device_node *np, const char *name) { -- 1.9.1
Hi Kuninori,
[auto build test ERROR on clk/clk-next] [also build test ERROR on v4.9-rc7 next-20161128] [if your patch is applied to the wrong git tree, please drop us a note to help improve the system]
url: https://github.com/0day-ci/linux/commits/Kuninori-Morimoto/clkdev-add-devm_o... base: https://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk-next config: i386-randconfig-x004-201648 (attached as .config) compiler: gcc-6 (Debian 6.2.0-3) 6.2.0 20160901 reproduce: # save the attached .config to linux build tree make ARCH=i386
All errors (new ones prefixed by >>):
drivers/clk/clk-devres.c:57:13: error: redefinition of 'devm_of_clk_get'
struct clk *devm_of_clk_get(struct device *dev, ^~~~~~~~~~~~~~~ In file included from drivers/clk/clk-devres.c:7:0: include/linux/clk.h:518:27: note: previous definition of 'devm_of_clk_get' was here static inline struct clk *devm_of_clk_get(struct device *dev, ^~~~~~~~~~~~~~~
vim +/devm_of_clk_get +57 drivers/clk/clk-devres.c
51 ret = devres_release(dev, devm_clk_release, devm_clk_match, clk); 52 53 WARN_ON(ret); 54 } 55 EXPORT_SYMBOL(devm_clk_put); 56
57 struct clk *devm_of_clk_get(struct device *dev,
58 struct device_node *np, int index) 59 { 60 struct clk **ptr, *clk;
--- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation
participants (3)
-
kbuild test robot -
Kuninori Morimoto -
Russell King - ARM Linux