diff options
author | Axel Lin <axel.lin@ingics.com> | 2012-11-13 07:20:50 -0500 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2012-11-15 06:31:23 -0500 |
commit | 6f37b1b4d407d6abcd24c4519cd892903229cd95 (patch) | |
tree | 2ff0edf60a91f17fb7c16d6c587357dda5f33d45 /drivers/pinctrl/spear | |
parent | 80357203ec68a2c8ebcb61d2cebdf02d10369af1 (diff) |
pinctrl: spear: Make get_gpio_pingroup return NULL when no gpio_pingroup found
Currently get_gpio_pingroup() may return NULL or ERR_PTR(-EINVAL) when
no gpio_pingroup found. The caller in gpio_request_endisable() only
checks if the return value is NULL. Return ERR_PTR(-EINVAL) for
get_gpio_pingroup() causes problem and seems not necessary.
Signed-off-by: Axel Lin <axel.lin@ingics.com>
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/pinctrl/spear')
-rw-r--r-- | drivers/pinctrl/spear/pinctrl-spear.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/pinctrl/spear/pinctrl-spear.c b/drivers/pinctrl/spear/pinctrl-spear.c index add933286e94..bf78eb7f85c4 100644 --- a/drivers/pinctrl/spear/pinctrl-spear.c +++ b/drivers/pinctrl/spear/pinctrl-spear.c | |||
@@ -286,12 +286,12 @@ static struct spear_gpio_pingroup *get_gpio_pingroup(struct spear_pmx *pmx, | |||
286 | unsigned pin) | 286 | unsigned pin) |
287 | { | 287 | { |
288 | struct spear_gpio_pingroup *gpio_pingroup; | 288 | struct spear_gpio_pingroup *gpio_pingroup; |
289 | int i = 0, j; | 289 | int i, j; |
290 | 290 | ||
291 | if (!pmx->machdata->gpio_pingroups) | 291 | if (!pmx->machdata->gpio_pingroups) |
292 | return NULL; | 292 | return NULL; |
293 | 293 | ||
294 | for (; i < pmx->machdata->ngpio_pingroups; i++) { | 294 | for (i = 0; i < pmx->machdata->ngpio_pingroups; i++) { |
295 | gpio_pingroup = &pmx->machdata->gpio_pingroups[i]; | 295 | gpio_pingroup = &pmx->machdata->gpio_pingroups[i]; |
296 | 296 | ||
297 | for (j = 0; j < gpio_pingroup->npins; j++) { | 297 | for (j = 0; j < gpio_pingroup->npins; j++) { |
@@ -300,7 +300,7 @@ static struct spear_gpio_pingroup *get_gpio_pingroup(struct spear_pmx *pmx, | |||
300 | } | 300 | } |
301 | } | 301 | } |
302 | 302 | ||
303 | return ERR_PTR(-EINVAL); | 303 | return NULL; |
304 | } | 304 | } |
305 | 305 | ||
306 | static int gpio_request_endisable(struct pinctrl_dev *pctldev, | 306 | static int gpio_request_endisable(struct pinctrl_dev *pctldev, |