summaryrefslogtreecommitdiffstats
path: root/drivers/pinctrl/sh-pfc/pinctrl.c
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>2013-03-10 16:38:23 +0100
committerLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>2013-03-15 13:33:54 +0100
commitb705c054255ae3264aa02d46347e9cfbcf26523a (patch)
treec2f379c90d286ebcdac9eaed849f40083dbded23 /drivers/pinctrl/sh-pfc/pinctrl.c
parentcd3c1beecfeb757b16904386ea474d3c272de4ee (diff)
downloadlinux-b705c054255ae3264aa02d46347e9cfbcf26523a.tar.bz2
sh-pfc: Use proper error codes
Return proper error codes instead of -1, and propagate the error codes. Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> Acked-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/pinctrl/sh-pfc/pinctrl.c')
-rw-r--r--drivers/pinctrl/sh-pfc/pinctrl.c24
1 files changed, 11 insertions, 13 deletions
diff --git a/drivers/pinctrl/sh-pfc/pinctrl.c b/drivers/pinctrl/sh-pfc/pinctrl.c
index b4960df6aa2d..c15091096f65 100644
--- a/drivers/pinctrl/sh-pfc/pinctrl.c
+++ b/drivers/pinctrl/sh-pfc/pinctrl.c
@@ -114,18 +114,16 @@ static int sh_pfc_func_enable(struct pinctrl_dev *pctldev, unsigned selector,
const struct sh_pfc_pin_group *grp = &pfc->info->groups[group];
unsigned long flags;
unsigned int i;
- int ret = -EINVAL;
+ int ret = 0;
spin_lock_irqsave(&pfc->lock, flags);
for (i = 0; i < grp->nr_pins; ++i) {
- if (sh_pfc_config_mux(pfc, grp->mux[i], PINMUX_TYPE_FUNCTION))
- goto done;
+ ret = sh_pfc_config_mux(pfc, grp->mux[i], PINMUX_TYPE_FUNCTION);
+ if (ret < 0)
+ break;
}
- ret = 0;
-
-done:
spin_unlock_irqrestore(&pfc->lock, flags);
return ret;
}
@@ -144,7 +142,7 @@ static int sh_pfc_reconfig_pin(struct sh_pfc_pinctrl *pmx, unsigned offset,
const struct sh_pfc_pin *pin = &pfc->info->pins[idx];
unsigned int mark = pin->enum_id;
unsigned long flags;
- int ret = -EINVAL;
+ int ret;
spin_lock_irqsave(&pfc->lock, flags);
@@ -156,17 +154,17 @@ static int sh_pfc_reconfig_pin(struct sh_pfc_pinctrl *pmx, unsigned offset,
case PINMUX_TYPE_INPUT_PULLDOWN:
break;
default:
- goto err;
+ ret = -EINVAL;
+ goto done;
}
- if (sh_pfc_config_mux(pfc, mark, new_type) != 0)
- goto err;
+ ret = sh_pfc_config_mux(pfc, mark, new_type);
+ if (ret < 0)
+ goto done;
cfg->type = new_type;
- ret = 0;
-
-err:
+done:
spin_unlock_irqrestore(&pfc->lock, flags);
return ret;