From: Stephen Warren <swarren@nvidia.com>
To: Linus Walleij <linus.walleij@linaro.org>
Cc: linux-kernel@vger.kernel.org, Stephen Warren <swarren@nvidia.com>
Subject: [PATCH 2/2] pinctrl: Pass name instead of device to pin_config_*
Date: Thu, 15 Dec 2011 16:57:17 -0700 [thread overview]
Message-ID: <1323993437-15149-2-git-send-email-swarren@nvidia.com> (raw)
In-Reply-To: <1323993437-15149-1-git-send-email-swarren@nvidia.com>
Obtaining a "struct pinctrl_dev *" is difficult for code not directly
related to the pinctrl subsystem. However, the device name of the pinctrl
device is fairly well known. So, modify pin_config_*() to take the device
name instead of the "struct pinctrl_dev *".
Signed-off-by: Stephen Warren <swarren@nvidia.com>
---
drivers/pinctrl/pinconf.c | 43 ++++++++++++++++++++++++++++++--------
include/linux/pinctrl/pinconf.h | 16 +++++++-------
2 files changed, 42 insertions(+), 17 deletions(-)
diff --git a/drivers/pinctrl/pinconf.c b/drivers/pinctrl/pinconf.c
index 3ddd4e9..38c5b41 100644
--- a/drivers/pinctrl/pinconf.c
+++ b/drivers/pinctrl/pinconf.c
@@ -31,12 +31,18 @@
* current pin state, it can be used directly by drivers as a numeral, or
* it can be dereferenced to any struct.
*/
-int pin_config_get(struct pinctrl_dev *pctldev, const char *name,
+int pin_config_get(const char *dev_name, const char *name,
unsigned long *config)
{
- const struct pinconf_ops *ops = pctldev->desc->confops;
+ struct pinctrl_dev *pctldev;
+ const struct pinconf_ops *ops;
int pin;
+ pctldev = get_pinctrl_dev_from_dev(NULL, dev_name);
+ if (!pctldev)
+ return -EINVAL;
+ ops = pctldev->desc->confops;
+
pin = pin_get_from_name(pctldev, name);
if (pin < 0)
return pin;
@@ -59,13 +65,19 @@ EXPORT_SYMBOL(pin_config_get);
* can be used directly by drivers as a numeral, or it can be dereferenced
* to any struct.
*/
-int pin_config_set(struct pinctrl_dev *pctldev, const char *name,
+int pin_config_set(const char *dev_name, const char *name,
unsigned long config)
{
- const struct pinconf_ops *ops = pctldev->desc->confops;
+ struct pinctrl_dev *pctldev;
+ const struct pinconf_ops *ops;
int pin;
int ret;
+ pctldev = get_pinctrl_dev_from_dev(NULL, dev_name);
+ if (!pctldev)
+ return -EINVAL;
+ ops = pctldev->desc->confops;
+
pin = pin_get_from_name(pctldev, name);
if (pin < 0)
return pin;
@@ -87,12 +99,18 @@ int pin_config_set(struct pinctrl_dev *pctldev, const char *name,
}
EXPORT_SYMBOL(pin_config_set);
-int pin_config_group_get(struct pinctrl_dev *pctldev, const char *pin_group,
+int pin_config_group_get(const char *dev_name, const char *pin_group,
unsigned long *config)
{
- const struct pinconf_ops *ops = pctldev->desc->confops;
+ struct pinctrl_dev *pctldev;
+ const struct pinconf_ops *ops;
int selector;
+ pctldev = get_pinctrl_dev_from_dev(NULL, dev_name);
+ if (!pctldev)
+ return -EINVAL;
+ ops = pctldev->desc->confops;
+
if (!ops || !ops->pin_config_group_get) {
dev_err(pctldev->dev, "cannot get configuration for pin "
"group, missing group config get function in "
@@ -109,17 +127,24 @@ int pin_config_group_get(struct pinctrl_dev *pctldev, const char *pin_group,
EXPORT_SYMBOL(pin_config_group_get);
-int pin_config_group_set(struct pinctrl_dev *pctldev, const char *pin_group,
+int pin_config_group_set(const char *dev_name, const char *pin_group,
unsigned long config)
{
- const struct pinctrl_ops *pctlops = pctldev->desc->pctlops;
- const struct pinconf_ops *ops = pctldev->desc->confops;
+ struct pinctrl_dev *pctldev;
+ const struct pinconf_ops *ops;
+ const struct pinctrl_ops *pctlops;
int selector;
const unsigned *pins;
unsigned num_pins;
int ret;
int i;
+ pctldev = get_pinctrl_dev_from_dev(NULL, dev_name);
+ if (!pctldev)
+ return -EINVAL;
+ ops = pctldev->desc->confops;
+ pctlops = pctldev->desc->pctlops;
+
if (!ops || (!ops->pin_config_group_set && !ops->pin_config_set)) {
dev_err(pctldev->dev, "cannot configure pin group, missing "
"config function in driver\n");
diff --git a/include/linux/pinctrl/pinconf.h b/include/linux/pinctrl/pinconf.h
index 8c2c88e..477922c 100644
--- a/include/linux/pinctrl/pinconf.h
+++ b/include/linux/pinctrl/pinconf.h
@@ -53,39 +53,39 @@ struct pinconf_ops {
unsigned selector);
};
-extern int pin_config_get(struct pinctrl_dev *pctldev, const char *name,
+extern int pin_config_get(const char *dev_name, const char *name,
unsigned long *config);
-extern int pin_config_set(struct pinctrl_dev *pctldev, const char *name,
+extern int pin_config_set(const char *dev_name, const char *name,
unsigned long config);
-extern int pin_config_group_get(struct pinctrl_dev *pctldev,
+extern int pin_config_group_get(const char *dev_name,
const char *pin_group,
unsigned long *config);
-extern int pin_config_group_set(struct pinctrl_dev *pctldev,
+extern int pin_config_group_set(const char *dev_name,
const char *pin_group,
unsigned long config);
#else
-static inline int pin_config_get(struct pinctrl_dev *pctldev, const char *name,
+static inline int pin_config_get(const char *dev_name, const char *name,
unsigned long *config)
{
return 0;
}
-static inline int pin_config_set(struct pinctrl_dev *pctldev, const char *name,
+static inline int pin_config_set(const char *dev_name, const char *name,
unsigned long config)
{
return 0;
}
-static inline int pin_config_group_get(struct pinctrl_dev *pctldev,
+static inline int pin_config_group_get(const char *dev_name,
const char *pin_group,
unsigned long *config)
{
return 0;
}
-static inline int pin_config_group_set(struct pinctrl_dev *pctldev,
+static inline int pin_config_group_set(const char *dev_name,
const char *pin_group,
unsigned long config)
{
--
1.7.0.4
next prev parent reply other threads:[~2011-12-15 23:57 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-15 23:57 [PATCH 1/2] pinctrl: Add "struct seq_file;" to pinconf.h Stephen Warren
2011-12-15 23:57 ` Stephen Warren [this message]
2011-12-18 22:27 ` [PATCH 2/2] pinctrl: Pass name instead of device to pin_config_* Linus Walleij
2011-12-19 18:20 ` Stephen Warren
2012-01-01 13:32 ` 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=1323993437-15149-2-git-send-email-swarren@nvidia.com \
--to=swarren@nvidia.com \
--cc=linus.walleij@linaro.org \
--cc=linux-kernel@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
all inboxes | Powered by JetHome®