From: Stephen Warren <swarren@nvidia.com>
To: Linus Walleij <linus.walleij@stericsson.com>,
Linus Walleij <linus.walleij@linaro.org>
Cc: linux-kernel@vger.kernel.org, Barry Song <21cnbao@gmail.com>,
Shawn Guo <shawn.guo@freescale.com>,
Sascha Hauer <s.hauer@pengutronix.de>,
David Brown <davidb@codeaurora.org>,
Grant Likely <grant.likely@secretlab.ca>,
Rongjun Ying <Rongjun.Ying@csr.com>,
Linaro Dev <linaro-dev@lists.linaro.org>,
Stephen Warren <swarren@nvidia.com>
Subject: [PATCH 1/4] pinctrl: get_group_pins() const fixes
Date: Wed, 19 Oct 2011 16:19:25 -0600 [thread overview]
Message-ID: <1319062768-26391-1-git-send-email-swarren@nvidia.com> (raw)
get_group_pins() "returns" a pointer to an array of const objects, through
a pointer parameter. Fix the prototype so what's pointed at by the returned
pointer is const, rather than the function parameter being const.
This also allows the removal of a cast in each of the two current pinmux
drivers.
Signed-off-by: Stephen Warren <swarren@nvidia.com>
---
drivers/pinctrl/core.c | 2 +-
drivers/pinctrl/pinmux-sirf.c | 6 +++---
drivers/pinctrl/pinmux-u300.c | 6 +++---
drivers/pinctrl/pinmux.c | 4 ++--
include/linux/pinctrl/pinctrl.h | 4 ++--
5 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/drivers/pinctrl/core.c b/drivers/pinctrl/core.c
index 623afbd..97a4eeb 100644
--- a/drivers/pinctrl/core.c
+++ b/drivers/pinctrl/core.c
@@ -332,7 +332,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/drivers/pinctrl/pinmux-sirf.c b/drivers/pinctrl/pinmux-sirf.c
index de5c78a..cad4f5d 100644
--- a/drivers/pinctrl/pinmux-sirf.c
+++ b/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/drivers/pinctrl/pinmux-u300.c b/drivers/pinctrl/pinmux-u300.c
index 23f082f..be6e04d 100644
--- a/drivers/pinctrl/pinmux-u300.c
+++ b/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/drivers/pinctrl/pinmux.c b/drivers/pinctrl/pinmux.c
index 08e7b0f..4679ae6 100644
--- a/drivers/pinctrl/pinmux.c
+++ b/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/include/linux/pinctrl/pinctrl.h b/include/linux/pinctrl/pinctrl.h
index 1e6f67e..be9f537 100644
--- a/include/linux/pinctrl/pinctrl.h
+++ b/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);
};
--
1.7.0.4
next reply other threads:[~2011-10-19 22:19 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-19 22:19 Stephen Warren [this message]
2011-10-19 22:19 ` [PATCH 2/4] pinctrl: Remove unsafe __refdata Stephen Warren
2011-10-20 9:44 ` Linus Walleij
2011-10-20 9:46 ` Barry Song
2011-10-20 9:54 ` Linus Walleij
2011-10-19 22:19 ` [PATCH 3/4] pinctrl: Don't copy pin names when registering them Stephen Warren
2011-10-20 9:45 ` Linus Walleij
2011-10-19 22:19 ` [PATCH 4/4] pinctrl: Don't copy function name when requesting a pin Stephen Warren
2011-10-20 9:48 ` Linus Walleij
2011-10-20 9:42 ` [PATCH 1/4] pinctrl: get_group_pins() const fixes Linus Walleij
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=1319062768-26391-1-git-send-email-swarren@nvidia.com \
--to=swarren@nvidia.com \
--cc=21cnbao@gmail.com \
--cc=Rongjun.Ying@csr.com \
--cc=davidb@codeaurora.org \
--cc=grant.likely@secretlab.ca \
--cc=linaro-dev@lists.linaro.org \
--cc=linus.walleij@linaro.org \
--cc=linus.walleij@stericsson.com \
--cc=linux-kernel@vger.kernel.org \
--cc=s.hauer@pengutronix.de \
--cc=shawn.guo@freescale.com \
/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
all inboxes | Powered by JetHome®