summaryrefslogtreecommitdiffstats
path: root/drivers/pinctrl/core.c
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@ingics.com>2013-08-19 10:06:29 +0800
committerLinus Walleij <linus.walleij@linaro.org>2013-08-23 08:56:29 +0200
commit6c325f874c9a4b5a783ed6c4a88fdddfc380acb1 (patch)
treee1e0ce004541036b72541e17e0facaaa98b028de /drivers/pinctrl/core.c
parente2b86b8481502f3f3039a31aa1a85b8a29e246f1 (diff)
downloadlinux-6c325f874c9a4b5a783ed6c4a88fdddfc380acb1.tar.bz2
pinctrl: core: Remove unnecessary test for desc->name
The implementation in pinctrl_register_one_pin() ensures pindesc->name is always not NULL before insert the pindesc to radix tree. If the desc return from pin_desc_get is not NULL, desc->name is always not NULL. Signed-off-by: Axel Lin <axel.lin@ingics.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/pinctrl/core.c')
-rw-r--r--drivers/pinctrl/core.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/pinctrl/core.c b/drivers/pinctrl/core.c
index faeb8726aee0..7094a8129008 100644
--- a/drivers/pinctrl/core.c
+++ b/drivers/pinctrl/core.c
@@ -153,9 +153,7 @@ int pin_get_from_name(struct pinctrl_dev *pctldev, const char *name)
pin = pctldev->desc->pins[i].number;
desc = pin_desc_get(pctldev, pin);
/* Pin space may be sparse */
- if (desc == NULL)
- continue;
- if (desc->name && !strcmp(name, desc->name))
+ if (desc && !strcmp(name, desc->name))
return pin;
}