pinctrl: do not care about blank pin name
If a pin name is not specified in struct pinctrl_pin_desc, pinctrl_register_one_pin() dynamically assigns its name. So, desc->name is always a valid pointer here. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Родитель
4fac724fd7
Коммит
cf9d994dcf
|
@ -1367,8 +1367,7 @@ static int pinctrl_pins_show(struct seq_file *s, void *what)
|
|||
if (desc == NULL)
|
||||
continue;
|
||||
|
||||
seq_printf(s, "pin %d (%s) ", pin,
|
||||
desc->name ? desc->name : "unnamed");
|
||||
seq_printf(s, "pin %d (%s) ", pin, desc->name);
|
||||
|
||||
/* Driver-specific info per pin */
|
||||
if (ops->pin_dbg_show)
|
||||
|
|
|
@ -258,8 +258,7 @@ void pinconf_show_setting(struct seq_file *s,
|
|||
case PIN_MAP_TYPE_CONFIGS_PIN:
|
||||
desc = pin_desc_get(setting->pctldev,
|
||||
setting->data.configs.group_or_pin);
|
||||
seq_printf(s, "pin %s (%d)",
|
||||
desc->name ? desc->name : "unnamed",
|
||||
seq_printf(s, "pin %s (%d)", desc->name,
|
||||
setting->data.configs.group_or_pin);
|
||||
break;
|
||||
case PIN_MAP_TYPE_CONFIGS_GROUP:
|
||||
|
@ -311,8 +310,7 @@ static int pinconf_pins_show(struct seq_file *s, void *what)
|
|||
if (desc == NULL)
|
||||
continue;
|
||||
|
||||
seq_printf(s, "pin %d (%s):", pin,
|
||||
desc->name ? desc->name : "unnamed");
|
||||
seq_printf(s, "pin %d (%s):", pin, desc->name);
|
||||
|
||||
pinconf_dump_pin(pctldev, s, pin);
|
||||
|
||||
|
|
|
@ -606,23 +606,17 @@ static int pinmux_pins_show(struct seq_file *s, void *what)
|
|||
if (pmxops->strict) {
|
||||
if (desc->mux_owner)
|
||||
seq_printf(s, "pin %d (%s): device %s%s",
|
||||
pin,
|
||||
desc->name ? desc->name : "unnamed",
|
||||
desc->mux_owner,
|
||||
pin, desc->name, desc->mux_owner,
|
||||
is_hog ? " (HOG)" : "");
|
||||
else if (desc->gpio_owner)
|
||||
seq_printf(s, "pin %d (%s): GPIO %s",
|
||||
pin,
|
||||
desc->name ? desc->name : "unnamed",
|
||||
desc->gpio_owner);
|
||||
pin, desc->name, desc->gpio_owner);
|
||||
else
|
||||
seq_printf(s, "pin %d (%s): UNCLAIMED",
|
||||
pin,
|
||||
desc->name ? desc->name : "unnamed");
|
||||
pin, desc->name);
|
||||
} else {
|
||||
/* For non-strict controllers */
|
||||
seq_printf(s, "pin %d (%s): %s %s%s", pin,
|
||||
desc->name ? desc->name : "unnamed",
|
||||
seq_printf(s, "pin %d (%s): %s %s%s", pin, desc->name,
|
||||
desc->mux_owner ? desc->mux_owner
|
||||
: "(MUX UNCLAIMED)",
|
||||
desc->gpio_owner ? desc->gpio_owner
|
||||
|
|
Загрузка…
Ссылка в новой задаче