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

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>

diff --git a/drivers/pinctrl/core.c b/drivers/pinctrl/core.c
index deb3d04323b04edd77971df2de20456f66a5cf6e..8b832ce6a8e358bc9a3cd9f38cedd91ba9b02e82 100644 (file)
--- a/drivers/pinctrl/core.c
+++ b/drivers/pinctrl/core.c
@@ -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;
 }