Merge branches 'for-4.10/upstream-fixes', 'for-4.11/intel-ish', 'for-4.11/mayflash...

[mirror_ubuntu-artful-kernel.git] / drivers / pinctrl / pinconf.c

diff --git a/drivers/pinctrl/pinconf.c b/drivers/pinctrl/pinconf.c
index 4dd7722f993552a4c8cd698cdc2f8d224dc337c4..799048f3c8d4ec271c5c8849d3a8f17c8ac4e1ff 100644 (file)
--- a/drivers/pinctrl/pinconf.c
+++ b/drivers/pinctrl/pinconf.c
@@ -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);
 
@@ -349,7 +347,7 @@ static int pinconf_groups_show(struct seq_file *s, void *what)
        while (selector < ngroups) {
                const char *gname = pctlops->get_group_name(pctldev, selector);
 
-               seq_printf(s, "%u (%s):", selector, gname);
+               seq_printf(s, "%u (%s): ", selector, gname);
                pinconf_dump_group(pctldev, s, selector, gname);
                seq_printf(s, "\n");