leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pinctrl: simplify the re-enable old state code in pinctrl_select_state

Browse Source 
Instead of just enabling the settings that were disabled in the 1st
loop, it's simpler to recall pinctrl_select_state with the old state.

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>
This commit is contained in:
Richard Genoud 2013-03-29 10:03:27 +01:00 committed by Linus Walleij
parent af60617771
commit 385d94246b
1 changed files with 3 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/pinctrl/core.c
View File

@ -981,26 +981,10 @@ unapply_new_state:
pinmux_disable_setting(setting2);
}
if (old_state) {
list_for_each_entry(setting, &old_state->settings, node) {
bool found = false;
if (setting->type != PIN_MAP_TYPE_MUX_GROUP)
continue;
list_for_each_entry(setting2, &state->settings, node) {
if (setting2->type != PIN_MAP_TYPE_MUX_GROUP)
continue;
if (setting2->data.mux.group ==
setting->data.mux.group) {
found = true;
break;
}
}
if (!found)
pinmux_enable_setting(setting);
}
}
/* There's no infinite recursive loop here because p->state is NULL */
if (old_state)
pinctrl_select_state_locked(p, old_state);
p->state = old_state;
return ret;
}