pinctrl: remove minor dead code
authorMichael Opdenacker <michael.opdenacker@free-electrons.com>
Tue, 29 Oct 2013 03:50:45 +0000 (04:50 +0100)
committerLinus Walleij <linus.walleij@linaro.org>
Mon, 4 Nov 2013 12:07:05 +0000 (13:07 +0100)
This removes a test whether the 'desc' variable is NULL.
This possibility has already been eliminated by the
below test earlier in the loop:

                if (desc == NULL) {
                        dev_warn(pctldev->dev,
                                 "could not get pin desc for pin %d\n",
                                 pins[i]);
                        continue;
                }

Found with Coverity: CID #1090078

Signed-off-by: Michael Opdenacker <michael.opdenacker@free-electrons.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
drivers/pinctrl/pinmux.c

index 9d144a2..9248ce4 100644 (file)
@@ -505,16 +505,14 @@ void pinmux_disable_setting(struct pinctrl_setting const *setting)
                        pin_free(pctldev, pins[i], NULL);
                } else {
                        const char *gname;
-                       const char *pname;
 
-                       pname = desc ? desc->name : "non-existing";
                        gname = pctlops->get_group_name(pctldev,
                                                setting->data.mux.group);
                        dev_warn(pctldev->dev,
                                 "not freeing pin %d (%s) as part of "
                                 "deactivating group %s - it is already "
                                 "used for some other setting",
-                                pins[i], pname, gname);
+                                pins[i], desc->name, gname);
                }
        }