diff options
| author | Richard Genoud <richard.genoud@gmail.com> | 2013-03-28 12:55:47 +0100 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2013-04-03 14:22:39 +0200 |
| commit | 8009d5ff00df6ad595f2d389f2e32bd4b97aebf5 (patch) | |
| tree | 57f7f3e21441f5865cda5700a519c3c8beda111e /drivers/pinctrl/core.c | |
| parent | da58751ca2490d5de3a0f7753fd7078c4285c2bc (diff) | |
| download | linux-8009d5ff00df6ad595f2d389f2e32bd4b97aebf5.tar.gz linux-8009d5ff00df6ad595f2d389f2e32bd4b97aebf5.tar.bz2 linux-8009d5ff00df6ad595f2d389f2e32bd4b97aebf5.zip | |
pinctrl: remove superfluous optimization in pinctrl_select_state_locked
As Stephen Warren suggested, checking first if the setting->node entry
is the first in the list or not is superfluous, as it is checked again
in the list_for_each_entry bellow.
So, remove it, the code will be simpler and lighter !
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.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/drivers/pinctrl/core.c b/drivers/pinctrl/core.c index 986d0e02761c..f04f7d3d9a94 100644 --- a/drivers/pinctrl/core.c +++ b/drivers/pinctrl/core.c @@ -967,20 +967,12 @@ static int pinctrl_select_state_locked(struct pinctrl *p, unapply_new_state: dev_err(p->dev, "Error applying setting, reverse things back\n"); - /* - * If the loop stopped on the 1st entry, nothing has been enabled, - * so jump directly to the 2nd phase - */ - if (list_entry(&setting->node, typeof(*setting), node) == - list_first_entry(&state->settings, typeof(*setting), node)) - goto reapply_old_state; - list_for_each_entry(setting2, &state->settings, node) { if (&setting2->node == &setting->node) break; pinctrl_free_setting(true, setting2); } -reapply_old_state: + if (old_state) { list_for_each_entry(setting, &old_state->settings, node) { bool found = false; |