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 04/14] clkdev: const-ify connection id to clk_add_alias()
Date: Fri, 03 Apr 2015 18:12:43 +0100 [thread overview]
Message-ID: <E1Ye599-0001B5-4B@rmk-PC.arm.linux.org.uk> (raw)
In-Reply-To: <20150403171149.GC13898@n2100.arm.linux.org.uk>
The connection id is only passed to clk_get() which is already const.
Const-ify this argument too.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
---
drivers/clk/clkdev.c | 6 +++---
include/linux/clkdev.h | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/clk/clkdev.c b/drivers/clk/clkdev.c
index 156f2e2f972c..5d7746d19445 100644
--- a/drivers/clk/clkdev.c
+++ b/drivers/clk/clkdev.c
@@ -308,10 +308,10 @@ clkdev_alloc(struct clk *clk, const char *con_id, const char *dev_fmt, ...)
}
EXPORT_SYMBOL(clkdev_alloc);
-int clk_add_alias(const char *alias, const char *alias_dev_name, char *id,
- struct device *dev)
+int clk_add_alias(const char *alias, const char *alias_dev_name,
+ const char *con_id, struct device *dev)
{
- struct clk *r = clk_get(dev, id);
+ struct clk *r = clk_get(dev, con_id);
struct clk_lookup *l;
if (IS_ERR(r))
diff --git a/include/linux/clkdev.h b/include/linux/clkdev.h
index 94bad77eeb4a..eb9b38a79b43 100644
--- a/include/linux/clkdev.h
+++ b/include/linux/clkdev.h
@@ -38,7 +38,7 @@ void clkdev_add(struct clk_lookup *cl);
void clkdev_drop(struct clk_lookup *cl);
void clkdev_add_table(struct clk_lookup *, size_t);
-int clk_add_alias(const char *, const char *, char *, struct device *);
+int clk_add_alias(const char *, const char *, const char *, struct device *);
int clk_register_clkdev(struct clk *, const char *, const char *, ...);
int clk_register_clkdevs(struct clk *, struct clk_lookup *, size_t);
--
1.8.3.1
next prev parent reply other threads:[~2015-04-03 17:12 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-03 17:11 [PATCH 00/14] Fix fallout from per-user struct clk patches Russell King - ARM Linux
2015-04-03 17:12 ` [PATCH 01/14] clk: update clk API documentation to clarify clk_round_rate() Russell King
2015-04-03 17:12 ` [PATCH 02/14] clkdev: drop __init from clkdev_add_table() Russell King
2015-04-03 17:12 ` [PATCH 03/14] clkdev: get rid of redundant clk_add_alias() prototype in linux/clk.h Russell King
2015-04-03 23:49 ` Tony Lindgren
2015-04-04 12:43 ` Robert Jarzmik
2015-04-04 12:53 ` Russell King - ARM Linux
2015-04-06 19:04 ` Stephen Boyd
2015-04-07 10:05 ` Robert Jarzmik
2015-04-07 12:42 ` Russell King - ARM Linux
2015-04-06 5:50 ` Sekhar Nori
2015-04-03 17:12 ` Russell King [this message]
2015-04-03 17:12 ` [PATCH 05/14] clkdev: use clk_hw internally Russell King
2015-04-06 20:18 ` Stephen Boyd
2015-04-03 17:12 ` [PATCH 06/14] clkdev: add clkdev_create() helper Russell King
2015-04-06 20:19 ` Stephen Boyd
2015-04-07 12:43 ` Russell King - ARM Linux
2015-04-07 23:09 ` Stephen Boyd
2015-04-03 17:12 ` [PATCH 07/14] media: omap3isp: remove unused clkdev Russell King
2015-04-03 21:44 ` Laurent Pinchart
2015-04-05 14:20 ` Russell King - ARM Linux
2015-04-07 9:42 ` Laurent Pinchart
2015-04-07 12:45 ` Russell King - ARM Linux
2015-04-07 14:38 ` Laurent Pinchart
2015-04-03 17:13 ` [PATCH 08/14] SH: use clkdev_add_table() Russell King
2015-04-03 17:13 ` [PATCH 09/14] ARM: lpc32xx: convert to " Russell King
2015-04-03 17:13 ` [PATCH 10/14] ARM: orion: use clkdev_create() Russell King
2015-04-04 0:17 ` Andrew Lunn
2015-04-07 13:20 ` Gregory CLEMENT
2015-04-07 14:01 ` Russell King - ARM Linux
2015-04-07 14:20 ` Gregory CLEMENT
2015-04-03 17:13 ` [PATCH 11/14] ARM: omap2: " Russell King
2015-04-03 23:49 ` Tony Lindgren
2015-04-03 17:13 ` [PATCH 12/14] ARM: omap2: use clkdev_add_alias() Russell King
2015-04-03 23:50 ` Tony Lindgren
2015-04-03 17:13 ` [PATCH 13/14] ASoC: migor: use clkdev_create() Russell King
2015-04-03 17:13 ` [PATCH 14/14] clk: s2mps11: " Russell King
2015-04-03 17:16 ` [PATCH 00/14] Fix fallout from per-user struct clk patches Russell King - ARM Linux
2015-04-05 9:04 ` Geert Uytterhoeven
2015-04-05 14:13 ` Russell King - ARM Linux
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=E1Ye599-0001B5-4B@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: 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).