From: Stephen Warren <swarren@nvidia.com>
To: Linus Walleij <linus.walleij@stericsson.com>
Cc: B29396@freescale.com, s.hauer@pengutronix.de, dongas86@gmail.com,
shawn.guo@linaro.org, thomas.abraham@linaro.org,
tony@atomide.com, linux-kernel@vger.kernel.org,
Stephen Warren <swarren@nvidia.com>
Subject: [PATCH 06/20] pinctrl: Re-order pinconf.[ch] to match each-other
Date: Sun, 19 Feb 2012 23:45:46 -0700 [thread overview]
Message-ID: <1329720360-23227-7-git-send-email-swarren@nvidia.com> (raw)
In-Reply-To: <1329720360-23227-1-git-send-email-swarren@nvidia.com>
Modify the two files so that the order of function prototypes in the
header matches the order of implementations in the .c file.
Don't prototype a couple of internal functions.
Signed-off-by: Stephen Warren <swarren@nvidia.com>
---
drivers/pinctrl/pinconf.c | 31 +++++++++++++++----------------
drivers/pinctrl/pinconf.h | 5 +----
2 files changed, 16 insertions(+), 20 deletions(-)
diff --git a/drivers/pinctrl/pinconf.c b/drivers/pinctrl/pinconf.c
index b74f64a..0c9d08d 100644
--- a/drivers/pinctrl/pinconf.c
+++ b/drivers/pinctrl/pinconf.c
@@ -23,7 +23,20 @@
#include "core.h"
#include "pinconf.h"
-int pin_config_get_for_pin(struct pinctrl_dev *pctldev, unsigned pin,
+int pinconf_check_ops(struct pinctrl_dev *pctldev)
+{
+ const struct pinconf_ops *ops = pctldev->desc->confops;
+
+ /* We must be able to read out pin status */
+ if (!ops->pin_config_get && !ops->pin_config_group_get)
+ return -EINVAL;
+ /* We have to be able to config the pins in SOME way */
+ if (!ops->pin_config_set && !ops->pin_config_group_set)
+ return -EINVAL;
+ return 0;
+}
+
+static int pin_config_get_for_pin(struct pinctrl_dev *pctldev, unsigned pin,
unsigned long *config)
{
const struct pinconf_ops *ops = pctldev->desc->confops;
@@ -63,7 +76,7 @@ int pin_config_get(const char *dev_name, const char *name,
}
EXPORT_SYMBOL(pin_config_get);
-int pin_config_set_for_pin(struct pinctrl_dev *pctldev, unsigned pin,
+static int pin_config_set_for_pin(struct pinctrl_dev *pctldev, unsigned pin,
unsigned long config)
{
const struct pinconf_ops *ops = pctldev->desc->confops;
@@ -138,7 +151,6 @@ int pin_config_group_get(const char *dev_name, const char *pin_group,
}
EXPORT_SYMBOL(pin_config_group_get);
-
int pin_config_group_set(const char *dev_name, const char *pin_group,
unsigned long config)
{
@@ -205,19 +217,6 @@ int pin_config_group_set(const char *dev_name, const char *pin_group,
}
EXPORT_SYMBOL(pin_config_group_set);
-int pinconf_check_ops(struct pinctrl_dev *pctldev)
-{
- const struct pinconf_ops *ops = pctldev->desc->confops;
-
- /* We must be able to read out pin status */
- if (!ops->pin_config_get && !ops->pin_config_group_get)
- return -EINVAL;
- /* We have to be able to config the pins in SOME way */
- if (!ops->pin_config_set && !ops->pin_config_group_set)
- return -EINVAL;
- return 0;
-}
-
#ifdef CONFIG_DEBUG_FS
static void pinconf_dump_pin(struct pinctrl_dev *pctldev,
diff --git a/drivers/pinctrl/pinconf.h b/drivers/pinctrl/pinconf.h
index 006b77f..1d6ea9d 100644
--- a/drivers/pinctrl/pinconf.h
+++ b/drivers/pinctrl/pinconf.h
@@ -14,12 +14,9 @@
#ifdef CONFIG_PINCONF
int pinconf_check_ops(struct pinctrl_dev *pctldev);
+
void pinconf_init_device_debugfs(struct dentry *devroot,
struct pinctrl_dev *pctldev);
-int pin_config_get_for_pin(struct pinctrl_dev *pctldev, unsigned pin,
- unsigned long *config);
-int pin_config_set_for_pin(struct pinctrl_dev *pctldev, unsigned pin,
- unsigned long config);
#else
--
1.7.5.4
next prev parent reply other threads:[~2012-02-20 6:47 UTC|newest]
Thread overview: 85+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-20 6:45 [PATCH 00/20] pinctrl: API change, config in mapping table Stephen Warren
2012-02-20 6:45 ` [PATCH 01/20] pinctrl: pinctrl_register_mappings() shouldn't be __init Stephen Warren
2012-02-20 21:01 ` Linus Walleij
2012-02-20 6:45 ` [PATCH 02/20] pinctrl: use list_add_tail instead of list_add Stephen Warren
2012-02-20 21:03 ` Linus Walleij
2012-02-20 6:45 ` [PATCH 03/20] pinctrl: Store mapping table as a list of chunks Stephen Warren
2012-02-20 21:08 ` Linus Walleij
2012-02-20 6:45 ` [PATCH 04/20] pinctrl: Record a pin owner, not mux function, when requesting pins Stephen Warren
2012-02-20 21:15 ` Linus Walleij
2012-02-21 17:23 ` Stephen Warren
2012-02-22 6:17 ` Linus Walleij
2012-02-20 6:45 ` [PATCH 05/20] pinctrl: Re-order pinmux.[ch] to match each-other Stephen Warren
2012-02-20 21:17 ` Linus Walleij
2012-02-20 6:45 ` Stephen Warren [this message]
2012-02-20 21:18 ` [PATCH 06/20] pinctrl: Re-order pinconf.[ch] " Linus Walleij
2012-02-20 6:45 ` [PATCH 07/20] pinctrl: core.c/h cleanups Stephen Warren
2012-02-20 21:20 ` Linus Walleij
2012-02-20 6:45 ` [PATCH 08/20] pinctrl: Assume map table entries can't have a NULL name field Stephen Warren
2012-02-20 21:42 ` Linus Walleij
2012-02-21 13:09 ` Dong Aisheng
2012-02-21 13:12 ` Linus Walleij
2012-02-21 17:46 ` Stephen Warren
2012-02-22 6:13 ` Linus Walleij
2012-02-22 6:34 ` Dong Aisheng
2012-02-22 18:05 ` Stephen Warren
2012-02-23 3:35 ` Dong Aisheng
2012-02-23 3:39 ` Stephen Warren
2012-02-23 3:56 ` Dong Aisheng
2012-02-23 3:53 ` Stephen Warren
2012-02-23 4:48 ` Dong Aisheng
2012-02-23 16:39 ` Stephen Warren
2012-02-24 8:40 ` Dong Aisheng
2012-02-21 13:08 ` Dong Aisheng
2012-02-21 17:38 ` Stephen Warren
2012-02-22 6:21 ` Dong Aisheng
2012-02-20 6:45 ` [PATCH 09/20] pinctrl: Disallow map table entries with NULL dev_name field Stephen Warren
2012-02-20 21:49 ` Linus Walleij
2012-02-22 6:46 ` Dong Aisheng
2012-02-20 6:45 ` [PATCH 10/20] pinctrl: Assume map table entries can't have a NULL ctrl_dev_name field Stephen Warren
2012-02-21 13:36 ` Linus Walleij
2012-02-22 6:49 ` Dong Aisheng
2012-02-20 6:45 ` [PATCH 11/20] pinctrl: Downgrade pinctrl_get warning when no maps are found Stephen Warren
2012-02-21 13:51 ` Linus Walleij
2012-02-22 5:54 ` Shawn Guo
2012-02-22 6:56 ` Dong Aisheng
2012-02-22 17:21 ` Stephen Warren
2012-02-23 3:48 ` Dong Aisheng
2012-02-20 6:45 ` [PATCH 12/20] pinctrl: Use dev_*() instead of pr_*(), add some msgs, minor cleanups Stephen Warren
2012-02-22 6:23 ` Linus Walleij
2012-02-22 7:01 ` Dong Aisheng
2012-02-20 6:45 ` [PATCH 13/20] pinctrl: Error if mapping table's control dev can't be found Stephen Warren
2012-02-21 13:58 ` Linus Walleij
2012-02-21 17:50 ` Stephen Warren
2012-02-20 6:45 ` [PATCH 14/20] pinctrl: Allocate sizeof(*p) instead of sizeof(struct foo) Stephen Warren
2012-02-22 6:25 ` Linus Walleij
2012-02-22 7:04 ` Dong Aisheng
2012-02-20 6:45 ` [PATCH 15/20] pinctrl: Fix and simplify locking Stephen Warren
2012-02-22 17:38 ` Linus Walleij
2012-02-22 18:26 ` Stephen Warren
2012-02-23 0:18 ` Stephen Warren
2012-02-20 6:45 ` [PATCH 16/20] pinctrl: Refactor struct pinctrl handling in core.c vs pinmux.c Stephen Warren
2012-02-22 17:18 ` Linus Walleij
2012-02-24 16:55 ` Dong Aisheng
2012-02-20 6:45 ` [PATCH 17/20] pinctrl: Add usecount to pins for muxing Stephen Warren
2012-02-22 17:21 ` Linus Walleij
2012-02-27 7:11 ` Dong Aisheng
2012-02-27 18:21 ` Stephen Warren
2012-02-20 6:45 ` [PATCH 18/20] pinctrl: Fix pinconf_groups_show() to emit newline Stephen Warren
2012-02-22 17:43 ` Linus Walleij
2012-02-20 6:45 ` [PATCH 19/20] pinctrl: API changes to support multiple states per device Stephen Warren
2012-02-23 5:54 ` Linus Walleij
2012-02-23 16:46 ` Stephen Warren
2012-02-27 9:07 ` Dong Aisheng
2012-02-27 18:37 ` Stephen Warren
2012-02-28 3:18 ` Dong Aisheng
2012-02-28 17:04 ` Stephen Warren
2012-02-29 2:26 ` Dong Aisheng
2012-02-20 6:46 ` [PATCH 20/20] pinctrl: Enhance mapping table to support pin config operations Stephen Warren
2012-02-23 6:08 ` Linus Walleij
2012-02-23 16:48 ` Stephen Warren
2012-02-23 21:13 ` Stephen Warren
2012-02-27 12:21 ` Dong Aisheng
2012-02-27 19:02 ` Stephen Warren
2012-02-28 3:41 ` Dong Aisheng
2012-02-20 21:51 ` [PATCH 00/20] pinctrl: API change, config in mapping table 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=1329720360-23227-7-git-send-email-swarren@nvidia.com \
--to=swarren@nvidia.com \
--cc=B29396@freescale.com \
--cc=dongas86@gmail.com \
--cc=linus.walleij@stericsson.com \
--cc=linux-kernel@vger.kernel.org \
--cc=s.hauer@pengutronix.de \
--cc=shawn.guo@linaro.org \
--cc=thomas.abraham@linaro.org \
--cc=tony@atomide.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
Powered by JetHome