mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-02 07:04:24 +00:00
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: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Acked-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
a7c1d0a987
commit
dff4359448
1 changed files with 3 additions and 10 deletions
|
@ -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,
|
||||||
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];
|
||||||
|
|
Loading…
Reference in a new issue