The new helper returns index of the mathing string in an array. We would use it
here.

Signed-off-by: Andy Shevchenko <[email protected]>
---
 drivers/pinctrl/pinmux.c | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/drivers/pinctrl/pinmux.c b/drivers/pinctrl/pinmux.c
index 29984b3..c223a9e 100644
--- a/drivers/pinctrl/pinmux.c
+++ b/drivers/pinctrl/pinmux.c
@@ -334,7 +334,6 @@ int pinmux_map_to_setting(struct pinctrl_map const *map,
        unsigned num_groups;
        int ret;
        const char *group;
-       int i;
 
        if (!pmxops) {
                dev_err(pctldev->dev, "does not support mux function\n");
@@ -363,19 +362,13 @@ int pinmux_map_to_setting(struct pinctrl_map const *map,
                return -EINVAL;
        }
        if (map->data.mux.group) {
-               bool found = false;
                group = map->data.mux.group;
-               for (i = 0; i < num_groups; i++) {
-                       if (!strcmp(group, groups[i])) {
-                               found = true;
-                               break;
-                       }
-               }
-               if (!found) {
+               ret = match_string(groups, num_groups, group);
+               if (ret < 0) {
                        dev_err(pctldev->dev,
                                "invalid group \"%s\" for function \"%s\"\n",
                                group, map->data.mux.function);
-                       return -EINVAL;
+                       return ret;
                }
        } else {
                group = groups[0];
-- 
2.6.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to