From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Mon, 9 Mar 2015 10:43:04 +0000 (+0000)
Subject: clkdev: const-ify connection id to clk_add_alias()
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=b3d8d7e89fab374d731dfb46fe048f09766ca9c8;p=deliverable%2Flinux.git

clkdev: const-ify connection id to clk_add_alias()

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>
---

diff --git a/drivers/clk/clkdev.c b/drivers/clk/clkdev.c
index 04b59ad6d852..e112e13af760 100644
--- a/drivers/clk/clkdev.c
+++ b/drivers/clk/clkdev.c
@@ -288,10 +288,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 3003afad46c9..cd93b215e3af 100644
--- a/include/linux/clkdev.h
+++ b/include/linux/clkdev.h
@@ -39,7 +39,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);