diff options
author | Marek Belisko <marek.belisko@open-nandra.com> | 2011-10-26 16:57:20 -0400 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2012-01-03 03:09:59 -0500 |
commit | d2f6a1c6fb0e510a24ccac066eefbcfd0c932858 (patch) | |
tree | a5180b9b911b32508c6423852a5419110bf5b821 /drivers/pinctrl/pinmux.c | |
parent | 7afde8baa83b9ac409a6db86f27a41878aa6b33f (diff) |
pinctrl: remove double pin validity check.
Function pin_is_valid just call pin_desc_get which is in pin_request
call some line below. Remove pin_is_valid() check.
Acked-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/pinctrl/pinmux.c')
-rw-r--r-- | drivers/pinctrl/pinmux.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/drivers/pinctrl/pinmux.c b/drivers/pinctrl/pinmux.c index 72b760bc880a..17c3931d5ef0 100644 --- a/drivers/pinctrl/pinmux.c +++ b/drivers/pinctrl/pinmux.c | |||
@@ -108,16 +108,6 @@ static int pin_request(struct pinctrl_dev *pctldev, | |||
108 | 108 | ||
109 | dev_dbg(&pctldev->dev, "request pin %d for %s\n", pin, function); | 109 | dev_dbg(&pctldev->dev, "request pin %d for %s\n", pin, function); |
110 | 110 | ||
111 | if (!pin_is_valid(pctldev, pin)) { | ||
112 | dev_err(&pctldev->dev, "pin is invalid\n"); | ||
113 | return -EINVAL; | ||
114 | } | ||
115 | |||
116 | if (!function) { | ||
117 | dev_err(&pctldev->dev, "no function name given\n"); | ||
118 | return -EINVAL; | ||
119 | } | ||
120 | |||
121 | desc = pin_desc_get(pctldev, pin); | 111 | desc = pin_desc_get(pctldev, pin); |
122 | if (desc == NULL) { | 112 | if (desc == NULL) { |
123 | dev_err(&pctldev->dev, | 113 | dev_err(&pctldev->dev, |
@@ -125,6 +115,11 @@ static int pin_request(struct pinctrl_dev *pctldev, | |||
125 | goto out; | 115 | goto out; |
126 | } | 116 | } |
127 | 117 | ||
118 | if (!function) { | ||
119 | dev_err(&pctldev->dev, "no function name given\n"); | ||
120 | return -EINVAL; | ||
121 | } | ||
122 | |||
128 | spin_lock(&desc->lock); | 123 | spin_lock(&desc->lock); |
129 | if (desc->mux_function) { | 124 | if (desc->mux_function) { |
130 | spin_unlock(&desc->lock); | 125 | spin_unlock(&desc->lock); |