From: Russell King <rmk+kernel@arm.linux.org.uk> To: alsa-devel@alsa-project.org, linux-arm-kernel@lists.infradead.org, linux-media@vger.kernel.org, linux-omap@vger.kernel.org, linux-sh@vger.kernel.org Subject: [PATCH 05/10] clkdev: add clkdev_create() helper Date: Mon, 02 Mar 2015 17:06:26 +0000 [thread overview] Message-ID: <E1YSTnW-0001Jk-Tm@rmk-PC.arm.linux.org.uk> (raw) In-Reply-To: <20150302170538.GQ8656@n2100.arm.linux.org.uk> Add a helper to allocate and add a clk_lookup structure. This can not only be used in several places in clkdev.c to simplify the code, but more importantly, can be used by callers of the clkdev code to simplify their clkdev creation and registration. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> --- drivers/clk/clkdev.c | 52 ++++++++++++++++++++++++++++++++++++++------------ include/linux/clkdev.h | 3 +++ 2 files changed, 43 insertions(+), 12 deletions(-) diff --git a/drivers/clk/clkdev.c b/drivers/clk/clkdev.c index 043fd3633373..611b9acbad78 100644 --- a/drivers/clk/clkdev.c +++ b/drivers/clk/clkdev.c @@ -294,6 +294,19 @@ vclkdev_alloc(struct clk *clk, const char *con_id, const char *dev_fmt, return &cla->cl; } +static struct clk_lookup * +vclkdev_create((struct clk *clk, const char *con_id, const char *dev_fmt, + va_list ap) +{ + struct clk_lookup *cl; + + cl = vclkdev_alloc(clk, con_id, dev_fmt, ap); + if (cl) + clkdev_add(cl); + + return cl; +} + struct clk_lookup * __init_refok clkdev_alloc(struct clk *clk, const char *con_id, const char *dev_fmt, ...) { @@ -308,6 +321,28 @@ clkdev_alloc(struct clk *clk, const char *con_id, const char *dev_fmt, ...) } EXPORT_SYMBOL(clkdev_alloc); +/** + * clkdev_create - allocate and add a clkdev lookup structure + * @clk: struct clk to associate with all clk_lookups + * @con_id: connection ID string on device + * @dev_fmt: format string describing device name + * + * Returns a clk_lookup structure, which can be later unregistered and + * freed. + */ +struct clk_lookup *clkdev_create(struct clk *clk, const char *con_id, + const char *dev_fmt, ...) +{ + struct clk_lookup *cl; + va_list ap; + + va_start(ap, dev_fmt); + cl = vclkdev_create(clk, con_id, dev_fmt, ap); + va_end(ap); + + return cl; +} + int clk_add_alias(const char *alias, const char *alias_dev_name, char *id, struct device *dev) { @@ -317,12 +352,10 @@ int clk_add_alias(const char *alias, const char *alias_dev_name, char *id, if (IS_ERR(r)) return PTR_ERR(r); - l = clkdev_alloc(r, alias, alias_dev_name); + l = vclkdev_create(r, alias, "%s", alias_dev_name); clk_put(r); - if (!l) - return -ENODEV; - clkdev_add(l); - return 0; + + return l ? 0 : -ENODEV; } EXPORT_SYMBOL(clk_add_alias); @@ -362,15 +395,10 @@ int clk_register_clkdev(struct clk *clk, const char *con_id, return PTR_ERR(clk); va_start(ap, dev_fmt); - cl = vclkdev_alloc(clk, con_id, dev_fmt, ap); + cl = vclkdev_create(clk, con_id, dev_fmt, ap); va_end(ap); - if (!cl) - return -ENOMEM; - - clkdev_add(cl); - - return 0; + return cl ? 0 : -ENOMEM; } EXPORT_SYMBOL(clk_register_clkdev); diff --git a/include/linux/clkdev.h b/include/linux/clkdev.h index 94bad77eeb4a..6f32f6d8b6ee 100644 --- a/include/linux/clkdev.h +++ b/include/linux/clkdev.h @@ -37,6 +37,9 @@ struct clk_lookup *clkdev_alloc(struct clk *clk, const char *con_id, void clkdev_add(struct clk_lookup *cl); void clkdev_drop(struct clk_lookup *cl); +struct clk_lookup *clkdev_create(struct clk *clk, const char *con_id, + const char *dev_fmt, ...); + void clkdev_add_table(struct clk_lookup *, size_t); int clk_add_alias(const char *, const char *, char *, struct device *); -- 1.8.3.1
WARNING: multiple messages have this Message-ID (diff)
From: rmk+kernel@arm.linux.org.uk (Russell King) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 05/10] clkdev: add clkdev_create() helper Date: Mon, 02 Mar 2015 17:06:26 +0000 [thread overview] Message-ID: <E1YSTnW-0001Jk-Tm@rmk-PC.arm.linux.org.uk> (raw) In-Reply-To: <20150302170538.GQ8656@n2100.arm.linux.org.uk> Add a helper to allocate and add a clk_lookup structure. This can not only be used in several places in clkdev.c to simplify the code, but more importantly, can be used by callers of the clkdev code to simplify their clkdev creation and registration. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> --- drivers/clk/clkdev.c | 52 ++++++++++++++++++++++++++++++++++++++------------ include/linux/clkdev.h | 3 +++ 2 files changed, 43 insertions(+), 12 deletions(-) diff --git a/drivers/clk/clkdev.c b/drivers/clk/clkdev.c index 043fd3633373..611b9acbad78 100644 --- a/drivers/clk/clkdev.c +++ b/drivers/clk/clkdev.c @@ -294,6 +294,19 @@ vclkdev_alloc(struct clk *clk, const char *con_id, const char *dev_fmt, return &cla->cl; } +static struct clk_lookup * +vclkdev_create((struct clk *clk, const char *con_id, const char *dev_fmt, + va_list ap) +{ + struct clk_lookup *cl; + + cl = vclkdev_alloc(clk, con_id, dev_fmt, ap); + if (cl) + clkdev_add(cl); + + return cl; +} + struct clk_lookup * __init_refok clkdev_alloc(struct clk *clk, const char *con_id, const char *dev_fmt, ...) { @@ -308,6 +321,28 @@ clkdev_alloc(struct clk *clk, const char *con_id, const char *dev_fmt, ...) } EXPORT_SYMBOL(clkdev_alloc); +/** + * clkdev_create - allocate and add a clkdev lookup structure + * @clk: struct clk to associate with all clk_lookups + * @con_id: connection ID string on device + * @dev_fmt: format string describing device name + * + * Returns a clk_lookup structure, which can be later unregistered and + * freed. + */ +struct clk_lookup *clkdev_create(struct clk *clk, const char *con_id, + const char *dev_fmt, ...) +{ + struct clk_lookup *cl; + va_list ap; + + va_start(ap, dev_fmt); + cl = vclkdev_create(clk, con_id, dev_fmt, ap); + va_end(ap); + + return cl; +} + int clk_add_alias(const char *alias, const char *alias_dev_name, char *id, struct device *dev) { @@ -317,12 +352,10 @@ int clk_add_alias(const char *alias, const char *alias_dev_name, char *id, if (IS_ERR(r)) return PTR_ERR(r); - l = clkdev_alloc(r, alias, alias_dev_name); + l = vclkdev_create(r, alias, "%s", alias_dev_name); clk_put(r); - if (!l) - return -ENODEV; - clkdev_add(l); - return 0; + + return l ? 0 : -ENODEV; } EXPORT_SYMBOL(clk_add_alias); @@ -362,15 +395,10 @@ int clk_register_clkdev(struct clk *clk, const char *con_id, return PTR_ERR(clk); va_start(ap, dev_fmt); - cl = vclkdev_alloc(clk, con_id, dev_fmt, ap); + cl = vclkdev_create(clk, con_id, dev_fmt, ap); va_end(ap); - if (!cl) - return -ENOMEM; - - clkdev_add(cl); - - return 0; + return cl ? 0 : -ENOMEM; } EXPORT_SYMBOL(clk_register_clkdev); diff --git a/include/linux/clkdev.h b/include/linux/clkdev.h index 94bad77eeb4a..6f32f6d8b6ee 100644 --- a/include/linux/clkdev.h +++ b/include/linux/clkdev.h @@ -37,6 +37,9 @@ struct clk_lookup *clkdev_alloc(struct clk *clk, const char *con_id, void clkdev_add(struct clk_lookup *cl); void clkdev_drop(struct clk_lookup *cl); +struct clk_lookup *clkdev_create(struct clk *clk, const char *con_id, + const char *dev_fmt, ...); + void clkdev_add_table(struct clk_lookup *, size_t); int clk_add_alias(const char *, const char *, char *, struct device *); -- 1.8.3.1
next prev parent reply other threads:[~2015-03-02 17:06 UTC|newest] Thread overview: 80+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-03-02 17:05 [PATCH 00/10] initial clkdev cleanups Russell King - ARM Linux 2015-03-02 17:05 ` Russell King - ARM Linux 2015-03-02 17:05 ` Russell King - ARM Linux 2015-03-02 17:06 ` [PATCH 01/10] media: omap3isp: remove unused clkdev Russell King 2015-03-02 17:06 ` Russell King 2015-03-02 17:06 ` Russell King 2015-03-02 22:33 ` Laurent Pinchart 2015-03-02 22:33 ` Laurent Pinchart 2015-03-02 22:33 ` Laurent Pinchart 2015-03-02 22:53 ` Sakari Ailus 2015-03-02 22:53 ` Sakari Ailus 2015-03-02 22:53 ` Sakari Ailus 2015-03-02 23:54 ` Russell King - ARM Linux 2015-03-02 23:54 ` Russell King - ARM Linux 2015-03-02 23:54 ` Russell King - ARM Linux 2015-03-03 0:39 ` Laurent Pinchart 2015-03-03 0:39 ` Laurent Pinchart 2015-03-03 0:39 ` Laurent Pinchart 2015-03-03 22:09 ` Sakari Ailus 2015-03-03 22:09 ` Sakari Ailus 2015-03-03 22:09 ` Sakari Ailus 2015-03-03 23:09 ` Sakari Ailus 2015-03-03 23:09 ` Sakari Ailus 2015-03-03 23:09 ` Sakari Ailus 2015-03-02 17:06 ` [PATCH 02/10] SH: use clkdev_add_table() Russell King 2015-03-02 17:06 ` Russell King 2015-03-02 17:18 ` Geert Uytterhoeven 2015-03-02 17:18 ` Geert Uytterhoeven 2015-03-02 17:18 ` Geert Uytterhoeven 2015-03-02 17:06 ` [PATCH 03/10] clk: versatile: convert Integrator IM/PD-1 to " Russell King 2015-03-02 17:06 ` Russell King 2015-03-02 17:06 ` [PATCH 04/10] ARM: lpc32xx: convert " Russell King 2015-03-02 17:06 ` Russell King 2015-03-02 17:06 ` Russell King [this message] 2015-03-02 17:06 ` [PATCH 05/10] clkdev: add clkdev_create() helper Russell King 2015-03-02 17:22 ` Geert Uytterhoeven 2015-03-02 17:22 ` Geert Uytterhoeven 2015-03-02 17:22 ` Geert Uytterhoeven 2015-03-02 17:46 ` Russell King - ARM Linux 2015-03-02 17:46 ` Russell King - ARM Linux 2015-03-02 17:46 ` Russell King - ARM Linux 2015-03-02 20:36 ` Geert Uytterhoeven 2015-03-02 20:36 ` Geert Uytterhoeven 2015-03-02 20:36 ` Geert Uytterhoeven 2015-03-02 19:07 ` Stephen Boyd 2015-03-02 19:07 ` Stephen Boyd 2015-03-02 19:07 ` Stephen Boyd 2015-03-02 21:01 ` Russell King - ARM Linux 2015-03-02 21:01 ` Russell King - ARM Linux 2015-03-02 21:01 ` Russell King - ARM Linux 2015-03-02 21:54 ` Stephen Boyd 2015-03-02 21:54 ` Stephen Boyd 2015-03-02 21:54 ` Stephen Boyd 2015-03-02 17:06 ` [PATCH 06/10] ASOC: migor: use clkdev_create() Russell King 2015-03-02 17:06 ` Russell King 2015-03-02 17:29 ` Mark Brown 2015-03-02 17:29 ` Mark Brown 2015-03-02 17:29 ` Mark Brown 2015-03-02 17:06 ` [PATCH 07/10] clk: s2mps11: " Russell King 2015-03-02 17:06 ` Russell King 2015-03-02 17:06 ` [PATCH 08/10] ARM: orion: " Russell King 2015-03-02 17:06 ` Russell King 2015-03-03 10:25 ` Thomas Petazzoni 2015-03-03 10:25 ` Thomas Petazzoni 2015-03-03 10:25 ` Thomas Petazzoni 2015-03-02 17:06 ` [PATCH 09/10] ARM: omap2: " Russell King 2015-03-02 17:06 ` Russell King 2015-03-02 17:06 ` [PATCH 10/10] ARM: omap2: use clkdev_add_alias() Russell King 2015-03-02 17:06 ` Russell King 2015-03-02 17:06 ` Russell King 2015-03-03 0:13 ` Tony Lindgren 2015-03-03 0:13 ` Tony Lindgren 2015-03-03 0:13 ` Tony Lindgren 2015-03-03 0:13 ` Tony Lindgren 2015-03-02 21:50 ` [PATCH 00/10] initial clkdev cleanups Stephen Boyd 2015-03-02 21:50 ` Stephen Boyd 2015-03-02 21:50 ` Stephen Boyd 2015-03-03 15:56 ` Andy Shevchenko 2015-03-03 15:56 ` Andy Shevchenko 2015-03-03 15:56 ` Andy Shevchenko
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=E1YSTnW-0001Jk-Tm@rmk-PC.arm.linux.org.uk \ --to=rmk+kernel@arm.linux.org.uk \ --cc=alsa-devel@alsa-project.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-media@vger.kernel.org \ --cc=linux-omap@vger.kernel.org \ --cc=linux-sh@vger.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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.