From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: Linus Walleij <linus.walleij@linaro.org>,
Bartosz Golaszewski <bgolaszewski@baylibre.com>,
linux-gpio@vger.kernel.org,
Geert Uytterhoeven <geert+renesas@glider.be>
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Subject: [PATCH v2 4/5] gpio: aggregator: Replace isrange() by using get_options()
Date: Wed, 20 Jan 2021 23:45:46 +0200 [thread overview]
Message-ID: <20210120214547.89770-4-andriy.shevchenko@linux.intel.com> (raw)
In-Reply-To: <20210120214547.89770-1-andriy.shevchenko@linux.intel.com>
We already have a nice helper called get_options() which can be used
to validate the input format. Replace isrange() by using it.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
drivers/gpio/gpio-aggregator.c | 33 +++------------------------------
1 file changed, 3 insertions(+), 30 deletions(-)
diff --git a/drivers/gpio/gpio-aggregator.c b/drivers/gpio/gpio-aggregator.c
index dfd8a4876a27..40a081b095fb 100644
--- a/drivers/gpio/gpio-aggregator.c
+++ b/drivers/gpio/gpio-aggregator.c
@@ -62,34 +62,6 @@ static char *get_arg(char **args)
return start;
}
-static bool isrange(const char *s)
-{
- size_t n;
-
- if (IS_ERR_OR_NULL(s))
- return false;
-
- while (1) {
- n = strspn(s, "0123456789");
- if (!n)
- return false;
-
- s += n;
-
- switch (*s++) {
- case '\0':
- return true;
-
- case '-':
- case ',':
- break;
-
- default:
- return false;
- }
- }
-}
-
static int aggr_add_gpio(struct gpio_aggregator *aggr, const char *key,
int hwnum, unsigned int *n)
{
@@ -112,10 +84,10 @@ static int aggr_add_gpio(struct gpio_aggregator *aggr, const char *key,
static int aggr_parse(struct gpio_aggregator *aggr)
{
+ char *name, *offsets, *p;
char *args = aggr->args;
unsigned long *bitmap;
unsigned int i, n = 0;
- char *name, *offsets;
int error = 0;
bitmap = bitmap_alloc(ARCH_NR_GPIOS, GFP_KERNEL);
@@ -130,7 +102,8 @@ static int aggr_parse(struct gpio_aggregator *aggr)
goto free_bitmap;
}
- if (!isrange(offsets)) {
+ p = get_options(offsets, 0, &error);
+ if (error == 0 || *p) {
/* Named GPIO line */
error = aggr_add_gpio(aggr, name, U16_MAX, &n);
if (error)
--
2.29.2
next prev parent reply other threads:[~2021-01-21 0:48 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-20 21:45 [PATCH v2 1/5] lib/cmdline_kunit: add a new test case for get_options() Andy Shevchenko
2021-01-20 21:45 ` [PATCH v2 2/5] lib/cmdline: Update documentation to reflect behaviour Andy Shevchenko
2021-01-22 11:12 ` Bartosz Golaszewski
2021-01-20 21:45 ` [PATCH v2 3/5] lib/cmdline: Allow get_options() to take 0 to validate the input Andy Shevchenko
2021-01-22 11:15 ` Bartosz Golaszewski
2021-01-22 12:13 ` Andy Shevchenko
2021-01-20 21:45 ` Andy Shevchenko [this message]
2021-01-21 13:17 ` [PATCH v2 4/5] gpio: aggregator: Replace isrange() by using get_options() Linus Walleij
2021-01-22 10:47 ` Bartosz Golaszewski
2021-01-20 21:45 ` [PATCH v2 5/5] gpio: aggregator: Remove trailing comma in terminator entries Andy Shevchenko
2021-01-21 13:17 ` Linus Walleij
2021-01-21 17:09 ` Andy Shevchenko
2021-01-22 10:46 ` Bartosz Golaszewski
2021-01-22 10:46 ` Bartosz Golaszewski
2021-01-22 10:50 ` Geert Uytterhoeven
2021-01-22 11:11 ` [PATCH v2 1/5] lib/cmdline_kunit: add a new test case for get_options() Bartosz Golaszewski
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=20210120214547.89770-4-andriy.shevchenko@linux.intel.com \
--to=andriy.shevchenko@linux.intel.com \
--cc=bgolaszewski@baylibre.com \
--cc=geert+renesas@glider.be \
--cc=linus.walleij@linaro.org \
--cc=linux-gpio@vger.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).