diff options
author | Michael Opdenacker <michael.opdenacker@free-electrons.com> | 2013-10-28 23:50:45 -0400 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2013-11-04 07:07:05 -0500 |
commit | 808e657c5c709844074d47a4284c746070b0772c (patch) | |
tree | 3d7c6f0c3b2fd353b104ddbba7c4cedc49c8f803 /drivers/pinctrl | |
parent | a3183c60e3e9be7abd830ebed904491625e07d2e (diff) |
pinctrl: remove minor dead code
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>
Diffstat (limited to 'drivers/pinctrl')
-rw-r--r-- | drivers/pinctrl/pinmux.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/pinctrl/pinmux.c b/drivers/pinctrl/pinmux.c index 9d144a263dc2..9248ce4efed4 100644 --- a/drivers/pinctrl/pinmux.c +++ b/drivers/pinctrl/pinmux.c | |||
@@ -505,16 +505,14 @@ void pinmux_disable_setting(struct pinctrl_setting const *setting) | |||
505 | pin_free(pctldev, pins[i], NULL); | 505 | pin_free(pctldev, pins[i], NULL); |
506 | } else { | 506 | } else { |
507 | const char *gname; | 507 | const char *gname; |
508 | const char *pname; | ||
509 | 508 | ||
510 | pname = desc ? desc->name : "non-existing"; | ||
511 | gname = pctlops->get_group_name(pctldev, | 509 | gname = pctlops->get_group_name(pctldev, |
512 | setting->data.mux.group); | 510 | setting->data.mux.group); |
513 | dev_warn(pctldev->dev, | 511 | dev_warn(pctldev->dev, |
514 | "not freeing pin %d (%s) as part of " | 512 | "not freeing pin %d (%s) as part of " |
515 | "deactivating group %s - it is already " | 513 | "deactivating group %s - it is already " |
516 | "used for some other setting", | 514 | "used for some other setting", |
517 | pins[i], pname, gname); | 515 | pins[i], desc->name, gname); |
518 | } | 516 | } |
519 | } | 517 | } |
520 | 518 | ||