Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ddd54040 authored by Markus Pargmann's avatar Markus Pargmann Committed by Linus Walleij
Browse files

gpio-sysfs: Use gpio descriptor name instead of gpiochip names array 



The name is now stored in the gpio descriptor as well, for example to
allow to store names from DT. This patch changes the sysfs gpio files
to use the gpio descriptor name.

Signed-off-by: default avatarMarkus Pargmann <mpa@pengutronix.de>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 5f3ca732

drivers/gpio/gpiolib-sysfs.c

+1 −7
Original line number Diff line number Diff line
@@ -550,9 +550,7 @@ int gpiod_export(struct gpio_desc *desc, bool direction_may_change) 
	struct gpiod_data	*data;

	unsigned long		flags;

	int			status;

	const char		*ioname = NULL;

	struct device		*dev;

	int			offset;



	/* can't export until sysfs is available ... */

	if (!gpio_class.p) {
@@ -601,13 +599,9 @@ int gpiod_export(struct gpio_desc *desc, bool direction_may_change) 
	else

		data->direction_can_change = false;



	offset = gpio_chip_hwgpio(desc);

	if (chip->names && chip->names[offset])

		ioname = chip->names[offset];



	dev = device_create_with_groups(&gpio_class, chip->dev,

					MKDEV(0, 0), data, gpio_groups,

					ioname ? ioname : "gpio%u",

					desc->name ? desc->name : "gpio%u",

					desc_to_gpio(desc));

	if (IS_ERR(dev)) {

		status = PTR_ERR(dev);