Accept partial 'gpio-line-names' property.

Documentation/devicetree/bindings/gpio/gpio.txt says: "The names are
assigned starting from line offset 0 from left to right from the
passed array. An incomplete array (where the number of passed named
are less than ngpios) will still be used up until the last provided
valid line index". This patch makes it actually work this way.

Signed-off-by: Christophe Blaess <christophe.blaess@logilin.fr>
Signed-off-by: Patrick Boettcher <p@yai.se>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Christophe Blaess 2018-09-28 15:38:43 +02:00 коммит произвёл Linus Walleij
Родитель 467480738d
Коммит 8dc1969744
1 изменённых файлов: 9 добавлений и 12 удалений

Просмотреть файл

@ -29,32 +29,29 @@ void devprop_gpiochip_set_names(struct gpio_chip *chip,
struct gpio_device *gdev = chip->gpiodev;
const char **names;
int ret, i;
int count;
ret = fwnode_property_read_string_array(fwnode, "gpio-line-names",
count = fwnode_property_read_string_array(fwnode, "gpio-line-names",
NULL, 0);
if (ret < 0)
if (count < 0)
return;
if (ret != gdev->ngpio) {
dev_warn(&gdev->dev,
"names %d do not match number of GPIOs %d\n", ret,
gdev->ngpio);
return;
}
if (count > gdev->ngpio)
count = gdev->ngpio;
names = kcalloc(gdev->ngpio, sizeof(*names), GFP_KERNEL);
names = kcalloc(count, sizeof(*names), GFP_KERNEL);
if (!names)
return;
ret = fwnode_property_read_string_array(fwnode, "gpio-line-names",
names, gdev->ngpio);
names, count);
if (ret < 0) {
dev_warn(&gdev->dev, "failed to read GPIO line names\n");
kfree(names);
return;
}
for (i = 0; i < gdev->ngpio; i++)
for (i = 0; i < count; i++)
gdev->descs[i].name = names[i];
kfree(names);