nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

gpio: aggregator: Use bitmap_parselist() for parsing GPIO offsets

Browse source 
Replace the custom code to parse GPIO offsets and/or GPIO offset ranges
by a call to bitmap_parselist(), and an iteration over the returned bit
mask.

This should have no impact on the format of the configuration parameters
written to the "new_device" virtual file in sysfs.

Suggested-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Link: https://lore.kernel.org/r/20200701114212.8520-3-geert+renesas@glider.be
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Geert Uytterhoeven 2020-07-01 13:42:12 +02:00 committed by Linus Walleij
parent 2073ea3ab1
commit ec75039d55
1 changed files with 25 additions and 32 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

57
drivers/gpio/gpio-aggregator.c
View file

@ -10,6 +10,7 @@
#include <linux/bitmap.h> #include <linux/bitmap.h>
#include <linux/bitops.h> #include <linux/bitops.h>
#include <linux/ctype.h> #include <linux/ctype.h>
#include <linux/gpio.h>
#include <linux/gpio/consumer.h> #include <linux/gpio/consumer.h>
#include <linux/gpio/driver.h> #include <linux/gpio/driver.h>
#include <linux/gpio/machine.h> #include <linux/gpio/machine.h>
@ -111,55 +112,45 @@ static int aggr_add_gpio(struct gpio_aggregator *aggr, const char *key,
static int aggr_parse(struct gpio_aggregator *aggr) static int aggr_parse(struct gpio_aggregator *aggr)
{ {
unsigned int first_index, last_index, i, n = 0;
char *name, *offsets, *first, *last, *next;
char *args = aggr->args; char *args = aggr->args;
int error; unsigned long *bitmap;
unsigned int i, n = 0;
char *name, *offsets;
int error = 0;
bitmap = bitmap_alloc(ARCH_NR_GPIOS, GFP_KERNEL);
if (!bitmap)
return -ENOMEM;
for (name = get_arg(&args), offsets = get_arg(&args); name; for (name = get_arg(&args), offsets = get_arg(&args); name;
offsets = get_arg(&args)) { offsets = get_arg(&args)) {
if (IS_ERR(name)) { if (IS_ERR(name)) {
pr_err("Cannot get GPIO specifier: %pe\n", name); pr_err("Cannot get GPIO specifier: %pe\n", name);
return PTR_ERR(name); error = PTR_ERR(name);
goto free_bitmap;
} }
if (!isrange(offsets)) { if (!isrange(offsets)) {
/* Named GPIO line */ /* Named GPIO line */
error = aggr_add_gpio(aggr, name, U16_MAX, &n); error = aggr_add_gpio(aggr, name, U16_MAX, &n);
if (error) if (error)
return error; goto free_bitmap;
name = offsets; name = offsets;
continue; continue;
} }
/* GPIO chip + offset(s) */ /* GPIO chip + offset(s) */
for (first = offsets; *first; first = next) { error = bitmap_parselist(offsets, bitmap, ARCH_NR_GPIOS);
next = strchrnul(first, ','); if (error) {
if (*next) pr_err("Cannot parse %s: %d\n", offsets, error);
*next++ = '\0'; goto free_bitmap;
}
last = strchr(first, '-'); for_each_set_bit(i, bitmap, ARCH_NR_GPIOS) {
if (last) error = aggr_add_gpio(aggr, name, i, &n);
*last++ = '\0'; if (error)
goto free_bitmap;
if (kstrtouint(first, 10, &first_index)) {
pr_err("Cannot parse GPIO index %s\n", first);
return -EINVAL;
}
if (!last) {
last_index = first_index;
} else if (kstrtouint(last, 10, &last_index)) {
pr_err("Cannot parse GPIO index %s\n", last);
return -EINVAL;
}
for (i = first_index; i <= last_index; i++) {
error = aggr_add_gpio(aggr, name, i, &n);
if (error)
return error;
}
} }
name = get_arg(&args); name = get_arg(&args);
@ -167,10 +158,12 @@ static int aggr_parse(struct gpio_aggregator *aggr)
if (!n) { if (!n) {
pr_err("No GPIOs specified\n"); pr_err("No GPIOs specified\n");
return -EINVAL; error = -EINVAL;
} }
return 0; free_bitmap:
bitmap_free(bitmap);
return error;
} }
static ssize_t new_device_store(struct device_driver *driver, const char *buf, static ssize_t new_device_store(struct device_driver *driver, const char *buf,