diff options
| author | Stephen Warren <swarren@nvidia.com> | 2011-10-19 16:19:27 -0600 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2011-10-20 11:50:06 +0200 |
| commit | 9af1e44fb4a4c62a90bff9b095eb001764d91b65 (patch) | |
| tree | ee15dbb393b2805b0da4daeda4f0cfc931fe42ca /drivers/pinctrl | |
| parent | 25aec320d993950474a065b59585e8dd006c3e18 (diff) | |
| download | linux-3.10-9af1e44fb4a4c62a90bff9b095eb001764d91b65.tar.gz linux-3.10-9af1e44fb4a4c62a90bff9b095eb001764d91b65.tar.bz2 linux-3.10-9af1e44fb4a4c62a90bff9b095eb001764d91b65.zip | |
pinctrl: Don't copy pin names when registering them
A pin controller's names array is no longer marked __refdata. Hence, we
can avoid copying a pin's name into the descriptor when registering it.
Instead, just point at the string supplied in the pin array.
This both simplifies and speeds up pin controller initialization, but
also removes the hard-coded maximum pin name length.
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/pinctrl')
| -rw-r--r-- | drivers/pinctrl/core.c | 5 | ||||
| -rw-r--r-- | drivers/pinctrl/core.h | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/drivers/pinctrl/core.c b/drivers/pinctrl/core.c index ceb63275c7f..423522d8731 100644 --- a/drivers/pinctrl/core.c +++ b/drivers/pinctrl/core.c @@ -164,9 +164,8 @@ static int pinctrl_register_one_pin(struct pinctrl_dev *pctldev, /* Set owner */ pindesc->pctldev = pctldev; - /* Copy optional basic pin info */ - if (name) - strlcpy(pindesc->name, name, sizeof(pindesc->name)); + /* Copy basic pin info */ + pindesc->name = name; spin_lock(&pctldev->pin_desc_tree_lock); radix_tree_insert(&pctldev->pin_desc_tree, number, pindesc); diff --git a/drivers/pinctrl/core.h b/drivers/pinctrl/core.h index 17e07772160..e431aa53728 100644 --- a/drivers/pinctrl/core.h +++ b/drivers/pinctrl/core.h @@ -55,7 +55,7 @@ struct pinctrl_dev { */ struct pin_desc { struct pinctrl_dev *pctldev; - char name[16]; + const char *name; spinlock_t lock; /* These fields only added when supporting pinmux drivers */ #ifdef CONFIG_PINMUX |