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>

diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
index 09b7316a983471970126bb13e7161083059c0db1..7c7c39c46eb7d154e7e513aa56e0de864beaa404 100644 (file)
--- a/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c
@@ -89,38 +89,6 @@ struct gpio_desc *gpio_to_desc(unsigned gpio)
 }
 EXPORT_SYMBOL_GPL(gpio_to_desc);
 
-/**
- * Convert a GPIO name to its descriptor
- */
-struct gpio_desc *gpio_name_to_desc(const char * const name)
-{
-       struct gpio_chip *chip;
-       unsigned long flags;
-
-       spin_lock_irqsave(&gpio_lock, flags);
-
-       list_for_each_entry(chip, &gpio_chips, list) {
-               int i;
-
-               for (i = 0; i != chip->ngpio; ++i) {
-                       struct gpio_desc *gpio = &chip->desc[i];
-
-                       if (!gpio->name)
-                               continue;
-
-                       if (!strcmp(gpio->name, name)) {
-                               spin_unlock_irqrestore(&gpio_lock, flags);
-                               return gpio;
-                       }
-               }
-       }
-
-       spin_unlock_irqrestore(&gpio_lock, flags);
-
-       return NULL;
-}
-EXPORT_SYMBOL_GPL(gpio_name_to_desc);
-
 /**
  * Get the GPIO descriptor corresponding to the given hw number for this chip.
  */
@@ -250,6 +218,37 @@ static int gpiochip_add_to_list(struct gpio_chip *chip)
        return err;
 }
 
+/**
+ * Convert a GPIO name to its descriptor
+ */
+static struct gpio_desc *gpio_name_to_desc(const char * const name)
+{
+       struct gpio_chip *chip;
+       unsigned long flags;
+
+       spin_lock_irqsave(&gpio_lock, flags);
+
+       list_for_each_entry(chip, &gpio_chips, list) {
+               int i;
+
+               for (i = 0; i != chip->ngpio; ++i) {
+                       struct gpio_desc *gpio = &chip->desc[i];
+
+                       if (!gpio->name)
+                               continue;
+
+                       if (!strcmp(gpio->name, name)) {
+                               spin_unlock_irqrestore(&gpio_lock, flags);
+                               return gpio;
+                       }
+               }
+       }
+
+       spin_unlock_irqrestore(&gpio_lock, flags);
+
+       return NULL;
+}
+
 /*
  * Takes the names from gc->names and checks if they are all unique. If they
  * are, they are assigned to their gpio descriptors.
@@ -268,11 +267,10 @@ static int gpiochip_set_desc_names(struct gpio_chip *gc)
                struct gpio_desc *gpio;
 
                gpio = gpio_name_to_desc(gc->names[i]);
-               if (gpio) {
-                       dev_err(gc->dev, "Detected name collision for GPIO name '%s'\n",
-                               gc->names[i]);
-                       return -EEXIST;
-               }
+               if (gpio)
+                       dev_warn(gc->dev, "Detected name collision for "
+                                "GPIO name '%s'\n",
+                                gc->names[i]);
        }
 
        /* Then add all names to the GPIO descriptors */

diff --git a/include/linux/gpio/consumer.h b/include/linux/gpio/consumer.h
index 366a3fdbdbeaad8ad0466c8c1fb064d4fecafdb1..fb0fde686cb1f80717c544ac18b380f6501afd39 100644 (file)
--- 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 */