summaryrefslogtreecommitdiffstats
path: root/drivers/pinctrl/pinmux.c
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2016-05-24 01:26:26 -0400
committerLinus Walleij <linus.walleij@linaro.org>2016-05-31 04:19:56 -0400
commitcf9d994dcf00c09c73eb686e239ab6449a248719 (patch)
tree45c00681c4a16285e0a3e194717060e9a69d1e03 /drivers/pinctrl/pinmux.c
parent4fac724fd76623c65ad00b412f5c7d0a816b98ff (diff)
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>
Diffstat (limited to 'drivers/pinctrl/pinmux.c')
-rw-r--r--drivers/pinctrl/pinmux.c14
1 files changed, 4 insertions, 10 deletions
diff --git a/drivers/pinctrl/pinmux.c b/drivers/pinctrl/pinmux.c
index c223a9ef1fe1..d94d76ca5651 100644
--- a/drivers/pinctrl/pinmux.c
+++ b/drivers/pinctrl/pinmux.c
@@ -606,23 +606,17 @@ static int pinmux_pins_show(struct seq_file *s, void *what)
606 if (pmxops->strict) { 606 if (pmxops->strict) {
607 if (desc->mux_owner) 607 if (desc->mux_owner)
608 seq_printf(s, "pin %d (%s): device %s%s", 608 seq_printf(s, "pin %d (%s): device %s%s",
609 pin, 609 pin, desc->name, desc->mux_owner,
610 desc->name ? desc->name : "unnamed",
611 desc->mux_owner,
612 is_hog ? " (HOG)" : ""); 610 is_hog ? " (HOG)" : "");
613 else if (desc->gpio_owner) 611 else if (desc->gpio_owner)
614 seq_printf(s, "pin %d (%s): GPIO %s", 612 seq_printf(s, "pin %d (%s): GPIO %s",
615 pin, 613 pin, desc->name, desc->gpio_owner);
616 desc->name ? desc->name : "unnamed",
617 desc->gpio_owner);
618 else 614 else
619 seq_printf(s, "pin %d (%s): UNCLAIMED", 615 seq_printf(s, "pin %d (%s): UNCLAIMED",
620 pin, 616 pin, desc->name);
621 desc->name ? desc->name : "unnamed");
622 } else { 617 } else {
623 /* For non-strict controllers */ 618 /* For non-strict controllers */
624 seq_printf(s, "pin %d (%s): %s %s%s", pin, 619 seq_printf(s, "pin %d (%s): %s %s%s", pin, desc->name,
625 desc->name ? desc->name : "unnamed",
626 desc->mux_owner ? desc->mux_owner 620 desc->mux_owner ? desc->mux_owner
627 : "(MUX UNCLAIMED)", 621 : "(MUX UNCLAIMED)",
628 desc->gpio_owner ? desc->gpio_owner 622 desc->gpio_owner ? desc->gpio_owner