aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Genoud <richard.genoud@gmail.com>2013-03-28 07:55:46 -0400
committerLinus Walleij <linus.walleij@linaro.org>2013-04-03 08:20:37 -0400
commitda58751ca2490d5de3a0f7753fd7078c4285c2bc (patch)
treef8b9e49a46f199af411bd282666d1554d50ec2f5
parent950707c0eb5c7aeaa2c446a04c824f4be686d2f6 (diff)
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>
-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,
956 break; 956 break;
957 } 957 }
958 958
959 if (ret < 0) { 959 if (ret < 0)
960 goto unapply_new_state; 960 goto unapply_new_state;
961 }
962 } 961 }
963 962
964 p->state = state; 963 p->state = state;
@@ -966,7 +965,7 @@ static int pinctrl_select_state_locked(struct pinctrl *p,
966 return 0; 965 return 0;
967 966
968unapply_new_state: 967unapply_new_state:
969 pr_info("Error applying setting, reverse things back\n"); 968 dev_err(p->dev, "Error applying setting, reverse things back\n");
970 969
971 /* 970 /*
972 * If the loop stopped on the 1st entry, nothing has been enabled, 971 * If the loop stopped on the 1st entry, nothing has been enabled,