From: Linus Walleij Date: Thu, 4 Jan 2018 21:31:11 +0000 (+0100) Subject: gpio: label descriptors using the device name X-Git-Tag: v5.15~9534^2~25 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=24e78079bf2250874e33da2e7cfbb6db72d3caf4;p=platform%2Fkernel%2Flinux-starfive.git gpio: label descriptors using the device name Some GPIO lines appear named "?" in the lsgpio dump due to their requesting drivers not passing a reasonable label. Most typically this happens if a device tree node just defines gpios = <...> and not foo-gpios = <...>, the former gets named "foo" and the latter gets named "?". However the struct device passed in is always valid so let's just label the GPIO with dev_name() on the device if no proper label was passed. Cc: Reported-by: Jason Kridner Reported-by: Jason Kridner Signed-off-by: Linus Walleij --- diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c index 7dde703b..9862931 100644 --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c @@ -3650,7 +3650,8 @@ struct gpio_desc *__must_check gpiod_get_index(struct device *dev, return desc; } - status = gpiod_request(desc, con_id); + /* If a connection label was passed use that, else use the device name as label */ + status = gpiod_request(desc, con_id ? con_id : dev_name(dev)); if (status < 0) return ERR_PTR(status);