Message ID | 1439561466-14350-5-git-send-email-mpa@pengutronix.de |
---|---|
State | New |
Headers | show |
On Fri, Aug 14, 2015 at 7:11 AM, Markus Pargmann <mpa@pengutronix.de> wrote: > 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: Markus Pargmann <mpa@pengutronix.de> Patch applied. This is a very nice patch too. Yours, Linus Walleij -- To unsubscribe from this list: send the line "unsubscribe linux-gpio" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/gpio/gpiolib-sysfs.c b/drivers/gpio/gpiolib-sysfs.c index b57ed8e55ab5..3e81f28e3aee 100644 --- a/drivers/gpio/gpiolib-sysfs.c +++ b/drivers/gpio/gpiolib-sysfs.c @@ -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);
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: Markus Pargmann <mpa@pengutronix.de> --- drivers/gpio/gpiolib-sysfs.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-)