Commit dff43594 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Linus Torvalds

pinctrl: convert to use match_string() helper

The new helper returns index of the mathing string in an array.  We
would use it here.
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent a7c1d0a9
...@@ -334,7 +334,6 @@ int pinmux_map_to_setting(struct pinctrl_map const *map, ...@@ -334,7 +334,6 @@ int pinmux_map_to_setting(struct pinctrl_map const *map,
unsigned num_groups; unsigned num_groups;
int ret; int ret;
const char *group; const char *group;
int i;
if (!pmxops) { if (!pmxops) {
dev_err(pctldev->dev, "does not support mux function\n"); dev_err(pctldev->dev, "does not support mux function\n");
...@@ -363,19 +362,13 @@ int pinmux_map_to_setting(struct pinctrl_map const *map, ...@@ -363,19 +362,13 @@ int pinmux_map_to_setting(struct pinctrl_map const *map,
return -EINVAL; return -EINVAL;
} }
if (map->data.mux.group) { if (map->data.mux.group) {
bool found = false;
group = map->data.mux.group; group = map->data.mux.group;
for (i = 0; i < num_groups; i++) { ret = match_string(groups, num_groups, group);
if (!strcmp(group, groups[i])) { if (ret < 0) {
found = true;
break;
}
}
if (!found) {
dev_err(pctldev->dev, dev_err(pctldev->dev,
"invalid group \"%s\" for function \"%s\"\n", "invalid group \"%s\" for function \"%s\"\n",
group, map->data.mux.function); group, map->data.mux.function);
return -EINVAL; return ret;
} }
} else { } else {
group = groups[0]; group = groups[0];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment