summaryrefslogtreecommitdiffstats
path: root/drivers/pinctrl/core.c
diff options
context:
space:
mode:
authorRichard Genoud <richard.genoud@gmail.com>2013-03-28 12:55:46 +0100
committerLinus Walleij <linus.walleij@linaro.org>2013-04-03 14:20:37 +0200
commitda58751ca2490d5de3a0f7753fd7078c4285c2bc (patch)
treef8b9e49a46f199af411bd282666d1554d50ec2f5 /drivers/pinctrl/core.c
parentpinctrl: sunxi: add clock support (diff)
downloadlinux-da58751ca2490d5de3a0f7753fd7078c4285c2bc.tar.xz
linux-da58751ca2490d5de3a0f7753fd7078c4285c2bc.zip
pinctrl: use dev_info instead of pr_info in pinctrl_select_state_locked
And remove superfluous brackets. Signed-off-by: Richard Genoud <richard.genoud@gmail.com> Reviewed-by: Stephen Warren <swarren@nvidia.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/pinctrl/core.c')
-rw-r--r--drivers/pinctrl/core.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/pinctrl/core.c b/drivers/pinctrl/core.c
index bcec05b5c67e..986d0e02761c 100644
--- a/drivers/pinctrl/core.c
+++ b/drivers/pinctrl/core.c
@@ -956,9 +956,8 @@ static int pinctrl_select_state_locked(struct pinctrl *p,
break;
}
- if (ret < 0) {
+ if (ret < 0)
goto unapply_new_state;
- }
}
p->state = state;
@@ -966,7 +965,7 @@ static int pinctrl_select_state_locked(struct pinctrl *p,
return 0;
unapply_new_state:
- pr_info("Error applying setting, reverse things back\n");
+ dev_err(p->dev, "Error applying setting, reverse things back\n");
/*
* If the loop stopped on the 1st entry, nothing has been enabled,