From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: Tejun Heo <tj@kernel.org>,
Linus Walleij <linus.walleij@linaro.org>,
Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>,
linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org,
"David S . Miller" <davem@davemloft.net>,
David Airlie <airlied@linux.ie>,
Andrew Morton <akpm@linux-foundation.org>,
Rasmus Villemoes <linux@rasmusvillemoes.dk>
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Subject: [PATCH v4 3/9] pinctrl: convert to use match_string() helper
Date: Thu, 28 Jan 2016 15:14:19 +0200 [thread overview]
Message-ID: <1453986865-133572-4-git-send-email-andriy.shevchenko@linux.intel.com> (raw)
In-Reply-To: <1453986865-133572-1-git-send-email-andriy.shevchenko@linux.intel.com>
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>
---
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.7.0.rc3
next prev parent reply other threads:[~2016-01-28 13:14 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-28 13:14 [PATCH v4 0/9] lib/string: introduce match_string() helper Andy Shevchenko
2016-01-28 13:14 ` [PATCH v4 1/9] " Andy Shevchenko
2016-02-02 6:05 ` Andrew Morton
2016-02-02 8:00 ` Andy Shevchenko
2016-02-02 19:50 ` Rasmus Villemoes
2016-01-28 13:14 ` [PATCH v4 2/9] device property: convert to use " Andy Shevchenko
2016-01-28 13:14 ` Andy Shevchenko [this message]
2016-02-02 6:02 ` [PATCH v4 3/9] pinctrl: " Andrew Morton
2016-02-02 8:08 ` Andy Shevchenko
2016-01-28 13:14 ` [PATCH v4 4/9] drm/edid: " Andy Shevchenko
2016-01-28 13:14 ` [PATCH v4 5/9] power: charger_manager: " Andy Shevchenko
2016-01-28 13:14 ` [PATCH v4 6/9] power: ab8500: " Andy Shevchenko
2016-01-28 13:14 ` [PATCH v4 7/9] ata: hpt366: " Andy Shevchenko
2016-01-28 13:14 ` [PATCH v4 8/9] ide: " Andy Shevchenko
2016-01-28 13:14 ` [PATCH v4 9/9] usb: common: " Andy Shevchenko
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1453986865-133572-4-git-send-email-andriy.shevchenko@linux.intel.com \
--to=andriy.shevchenko@linux.intel.com \
--cc=airlied@linux.ie \
--cc=akpm@linux-foundation.org \
--cc=davem@davemloft.net \
--cc=dbaryshkov@gmail.com \
--cc=linus.walleij@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=linux@rasmusvillemoes.dk \
--cc=tj@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).