gpiolib: define gpio suffixes globally

Avoid multiple identical definitions of the gpio suffix strings by putting
them into a global constant array.

Signed-off-by: Rojhalat Ibrahim <imr@rtschenk.de>
Reviewed-by: Alexandre Courbot <acourbot@nvidia.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
index 15837263dbb31a93a934d7dfed5067e5b56d5c06..2f8296c021e5c73856764be2a7d648f4229f9599 100644 (file)
--- a/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c
@@ -1662,19 +1662,18 @@ static struct gpio_desc *of_find_gpio(struct device *dev, const char *con_id,
                                      unsigned int idx,
                                      enum gpio_lookup_flags *flags)
 {
-       static const char * const suffixes[] = { "gpios", "gpio" };
        char prop_name[32]; /* 32 is max size of property name */
        enum of_gpio_flags of_flags;
        struct gpio_desc *desc;
        unsigned int i;
 
-       for (i = 0; i < ARRAY_SIZE(suffixes); i++) {
+       for (i = 0; i < ARRAY_SIZE(gpio_suffixes); i++) {
                if (con_id)
                        snprintf(prop_name, sizeof(prop_name), "%s-%s", con_id,
-                                                              suffixes[i]);
+                                gpio_suffixes[i]);
                else
                        snprintf(prop_name, sizeof(prop_name), "%s",
-                                                              suffixes[i]);
+                                gpio_suffixes[i]);
 
                desc = of_get_named_gpiod_flags(dev->of_node, prop_name, idx,
                                                &of_flags);
@@ -1695,7 +1694,6 @@ static struct gpio_desc *acpi_find_gpio(struct device *dev, const char *con_id,
                                        unsigned int idx,
                                        enum gpio_lookup_flags *flags)
 {
-       static const char * const suffixes[] = { "gpios", "gpio" };
        struct acpi_device *adev = ACPI_COMPANION(dev);
        struct acpi_gpio_info info;
        struct gpio_desc *desc;
@@ -1703,13 +1701,13 @@ static struct gpio_desc *acpi_find_gpio(struct device *dev, const char *con_id,
        int i;
 
        /* Try first from _DSD */
-       for (i = 0; i < ARRAY_SIZE(suffixes); i++) {
+       for (i = 0; i < ARRAY_SIZE(gpio_suffixes); i++) {
                if (con_id && strcmp(con_id, "gpios")) {
                        snprintf(propname, sizeof(propname), "%s-%s",
-                                con_id, suffixes[i]);
+                                con_id, gpio_suffixes[i]);
                } else {
                        snprintf(propname, sizeof(propname), "%s",
-                                suffixes[i]);
+                                gpio_suffixes[i]);
                }
 
                desc = acpi_get_gpiod_by_index(adev, propname, idx, &info);

diff --git a/drivers/gpio/gpiolib.h b/drivers/gpio/gpiolib.h
index cadba26c45a6b1a1ad2569461386f3e1efaa9ba7..205dd12659c04973be9338c8e7a8923bf93c0b54 100644 (file)
--- a/drivers/gpio/gpiolib.h
+++ b/drivers/gpio/gpiolib.h
@@ -27,6 +27,9 @@ struct acpi_gpio_info {
        bool active_low;
 };
 
+/* gpio suffixes used for ACPI and device tree lookup */
+static const char * const gpio_suffixes[] = { "gpios", "gpio" };
+
 #ifdef CONFIG_ACPI
 void acpi_gpiochip_add(struct gpio_chip *chip);
 void acpi_gpiochip_remove(struct gpio_chip *chip);