From 9af1e44fb4a4c62a90bff9b095eb001764d91b65 Mon Sep 17 00:00:00 2001 From: Stephen Warren Date: Wed, 19 Oct 2011 16:19:27 -0600 Subject: [PATCH] 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 Signed-off-by: Linus Walleij --- drivers/pinctrl/core.c | 5 ++--- 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 ceb63275c7fe..423522d87313 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 17e07772160c..e431aa537287 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 -- 2.30.2