From 47a06813c1beee4e2f1dfff4bc8f4c6517daa55a Mon Sep 17 00:00:00 2001
From: Stephen Warren <swarren@nvidia.com>
Date: Wed, 19 Oct 2011 16:19:25 -0600
Subject: [PATCH] --- yaml --- r: 267023 b: refs/heads/master c:
 a5818a8bd095a08cfb1871b63af9c8bed103e4b9 h: refs/heads/master i:   267021:
 8ee814fd9dd7936698524ce20b512bd6fc7b2dd2   267019:
 b42deb62b469231982f1fe8fb7b2b64953db602f   267015:
 eebdf464062dc1a6059041646015e4c2741c29be   267007:
 0a25e4a3b7753d7cbf354992ed0471f98d787382 v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/pinctrl/core.c          | 2 +-
 trunk/drivers/pinctrl/pinmux-sirf.c   | 6 +++---
 trunk/drivers/pinctrl/pinmux-u300.c   | 6 +++---
 trunk/drivers/pinctrl/pinmux.c        | 4 ++--
 trunk/include/linux/pinctrl/pinctrl.h | 4 ++--
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index 0c6665c9a0e3..d7b2fe2b6568 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 393daa814f4bbc6f5c099178c073fae9f7ef6177
+refs/heads/master: a5818a8bd095a08cfb1871b63af9c8bed103e4b9
diff --git a/trunk/drivers/pinctrl/core.c b/trunk/drivers/pinctrl/core.c
index b2eaf8d4412a..ceb63275c7fe 100644
--- a/trunk/drivers/pinctrl/core.c
+++ b/trunk/drivers/pinctrl/core.c
@@ -329,7 +329,7 @@ static int pinctrl_groups_show(struct seq_file *s, void *what)
 
 	seq_puts(s, "registered pin groups:\n");
 	while (ops->list_groups(pctldev, selector) >= 0) {
-		unsigned *pins;
+		const unsigned *pins;
 		unsigned num_pins;
 		const char *gname = ops->get_group_name(pctldev, selector);
 		int ret;
diff --git a/trunk/drivers/pinctrl/pinmux-sirf.c b/trunk/drivers/pinctrl/pinmux-sirf.c
index c48c5634201e..ddcea1820935 100644
--- a/trunk/drivers/pinctrl/pinmux-sirf.c
+++ b/trunk/drivers/pinctrl/pinmux-sirf.c
@@ -869,12 +869,12 @@ static const char *sirfsoc_get_group_name(struct pinctrl_dev *pctldev,
 }
 
 static int sirfsoc_get_group_pins(struct pinctrl_dev *pctldev, unsigned selector,
-			       unsigned ** const pins,
-			       unsigned * const num_pins)
+			       const unsigned **pins,
+			       const unsigned *num_pins)
 {
 	if (selector >= ARRAY_SIZE(sirfsoc_pin_groups))
 		return -EINVAL;
-	*pins = (unsigned *) sirfsoc_pin_groups[selector].pins;
+	*pins = sirfsoc_pin_groups[selector].pins;
 	*num_pins = sirfsoc_pin_groups[selector].num_pins;
 	return 0;
 }
diff --git a/trunk/drivers/pinctrl/pinmux-u300.c b/trunk/drivers/pinctrl/pinmux-u300.c
index f9db1cebff00..71d23b736ff5 100644
--- a/trunk/drivers/pinctrl/pinmux-u300.c
+++ b/trunk/drivers/pinctrl/pinmux-u300.c
@@ -849,12 +849,12 @@ static const char *u300_get_group_name(struct pinctrl_dev *pctldev,
 }
 
 static int u300_get_group_pins(struct pinctrl_dev *pctldev, unsigned selector,
-			       unsigned ** const pins,
-			       unsigned * const num_pins)
+			       const unsigned **pins,
+			       unsigned *num_pins)
 {
 	if (selector >= ARRAY_SIZE(u300_pin_groups))
 		return -EINVAL;
-	*pins = (unsigned *) u300_pin_groups[selector].pins;
+	*pins = u300_pin_groups[selector].pins;
 	*num_pins = u300_pin_groups[selector].num_pins;
 	return 0;
 }
diff --git a/trunk/drivers/pinctrl/pinmux.c b/trunk/drivers/pinctrl/pinmux.c
index 6544d98b2cf8..90fb00d9a8a2 100644
--- a/trunk/drivers/pinctrl/pinmux.c
+++ b/trunk/drivers/pinctrl/pinmux.c
@@ -326,7 +326,7 @@ static int acquire_pins(struct pinctrl_dev *pctldev,
 	const struct pinmux_ops *pmxops = pctldev->desc->pmxops;
 	const char *func = pmxops->get_function_name(pctldev,
 						     func_selector);
-	unsigned *pins;
+	const unsigned *pins;
 	unsigned num_pins;
 	int ret;
 	int i;
@@ -367,7 +367,7 @@ static void release_pins(struct pinctrl_dev *pctldev,
 			 unsigned group_selector)
 {
 	const struct pinctrl_ops *pctlops = pctldev->desc->pctlops;
-	unsigned *pins;
+	const unsigned *pins;
 	unsigned num_pins;
 	int ret;
 	int i;
diff --git a/trunk/include/linux/pinctrl/pinctrl.h b/trunk/include/linux/pinctrl/pinctrl.h
index 4f8d2089acce..3605e947fa90 100644
--- a/trunk/include/linux/pinctrl/pinctrl.h
+++ b/trunk/include/linux/pinctrl/pinctrl.h
@@ -75,8 +75,8 @@ struct pinctrl_ops {
 				       unsigned selector);
 	int (*get_group_pins) (struct pinctrl_dev *pctldev,
 			       unsigned selector,
-			       unsigned ** const pins,
-			       unsigned * const num_pins);
+			       const unsigned **pins,
+			       unsigned *num_pins);
 	void (*pin_dbg_show) (struct pinctrl_dev *pctldev, struct seq_file *s,
 			  unsigned offset);
 };