[PATCH] pinctrl: spear: Make get_gpio_pingroup return NULL when no gpio_pingroup found

[PATCH] pinctrl: spear: Make get_gpio_pingroup return NULL when no gpio_pingroup found

[Axel Lin]

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>
---
 drivers/pinctrl/spear/pinctrl-spear.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/pinctrl/spear/pinctrl-spear.c b/drivers/pinctrl/spear/pinctrl-spear.c
index 107780c..42bc267 100644
--- a/drivers/pinctrl/spear/pinctrl-spear.c
+++ b/drivers/pinctrl/spear/pinctrl-spear.c
@@ -284,12 +284,12 @@ static struct spear_gpio_pingroup *get_gpio_pingroup(struct spear_pmx *pmx,
 		unsigned pin)
 {
 	struct spear_gpio_pingroup *gpio_pingroup;
-	int i = 0, j;
+	int i, j;
 
 	if (!pmx->machdata->gpio_pingroups)
 		return NULL;
 
-	for (; i < pmx->machdata->ngpio_pingroups; i++) {
+	for (i = 0; i < pmx->machdata->ngpio_pingroups; i++) {
 		gpio_pingroup = &pmx->machdata->gpio_pingroups[i];
 
 		for (j = 0; j < gpio_pingroup->npins; j++) {
@@ -298,7 +298,7 @@ static struct spear_gpio_pingroup *get_gpio_pingroup(struct spear_pmx *pmx,
 		}
 	}
 
-	return ERR_PTR(-EINVAL);
+	return NULL;
 }
 
 static int gpio_request_endisable(struct pinctrl_dev *pctldev,
-- 
1.7.9.5

Re: [PATCH] pinctrl: spear: Make get_gpio_pingroup return NULL when no gpio_pingroup found

[Linus Walleij]

On Tue, Nov 13, 2012 at 1:20 PM, Axel Lin <axel.lin@ingics.com> wrote:

> 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>

Applied with Viresh's ACK.

Yours,
Linus Walleij