summaryrefslogtreecommitdiffstats
path: root/include/linux/gpio
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2015-09-23 16:20:43 -0700
committerLinus Walleij <linus.walleij@linaro.org>2015-09-24 10:48:53 -0700
commitf881bab038c9667deab19a85d8666029cbfa6f2c (patch)
treecb2052e36749a8474f4cbf78008f6984f88a6ed4 /include/linux/gpio
parentced433e2a4a0f11362c149daf802157ffb65ee20 (diff)
downloadtalos-op-linux-f881bab038c9667deab19a85d8666029cbfa6f2c.tar.gz
talos-op-linux-f881bab038c9667deab19a85d8666029cbfa6f2c.zip
gpio: keep the GPIO line names internal
This refactors the changes to the GPIO line naming mechanism to not have so widespread effects, instead we conclude the patch series by having created a name attribute in the GPIO descriptor, that need not be globally unique, and it will be initialized from the old .names array in struct gpio_chip if it exists, then used in the legacy sysfs code like the array was used previously. The associated changes to name lines from the device tree are controversial and need to stand alone from this. Resulting changes: 1. Remove the export and the header for the gpio_name_to_desc() as so far the only use is inside gpiolib.c. Staticize gpio_name_to_desc() and move it above the only function using it. 2. Only print a warning if there are two GPIO lines with the same name. The reason is to preserve current behaviour: before the previous changes to the naming mechanism this would not reject probing the driver, instead the error would occur when trying to export the line in sysfs, so restore this behaviour, but print a friendly warning if names collide. Cc: Johan Hovold <johan@kernel.org> Cc: Markus Pargmann <mpa@pengutronix.de> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'include/linux/gpio')
-rw-r--r--include/linux/gpio/consumer.h6
1 files changed, 0 insertions, 6 deletions
diff --git a/include/linux/gpio/consumer.h b/include/linux/gpio/consumer.h
index 366a3fdbdbea..fb0fde686cb1 100644
--- a/include/linux/gpio/consumer.h
+++ b/include/linux/gpio/consumer.h
@@ -130,7 +130,6 @@ int gpiod_to_irq(const struct gpio_desc *desc);
/* Convert between the old gpio_ and new gpiod_ interfaces */
struct gpio_desc *gpio_to_desc(unsigned gpio);
int desc_to_gpio(const struct gpio_desc *desc);
-struct gpio_desc *gpio_name_to_desc(const char *name);
/* Child properties interface */
struct fwnode_handle;
@@ -402,11 +401,6 @@ static inline struct gpio_desc *gpio_to_desc(unsigned gpio)
return ERR_PTR(-EINVAL);
}
-static inline struct gpio_desc *gpio_name_to_desc(const char *name)
-{
- return ERR_PTR(-EINVAL);
-}
-
static inline int desc_to_gpio(const struct gpio_desc *desc)
{
/* GPIO can never have been requested */
OpenPOWER on IntegriCloud