gpiolib: Replace gpio_suffix_count with NULL-terminated array

There is no need to have and export the count variable for the array
in question. Instead, make it NULL-terminated.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20240819142945.327808-6-andriy.shevchenko@linux.intel.com
Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>

diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
index 3a9668cc100df507fcead9f761b216041cda03a3..3903d0a75304cbf4c81fd5e2d31f3530363fa0c5 100644 (file)
--- a/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c
@@ -90,8 +90,7 @@ DEFINE_STATIC_SRCU(gpio_devices_srcu);
 static DEFINE_MUTEX(gpio_machine_hogs_mutex);
 static LIST_HEAD(gpio_machine_hogs);
 
-const char *const gpio_suffixes[] = { "gpios", "gpio" };
-const size_t gpio_suffix_count = ARRAY_SIZE(gpio_suffixes);
+const char *const gpio_suffixes[] = { "gpios", "gpio", NULL };
 
 static void gpiochip_free_hogs(struct gpio_chip *gc);
 static int gpiochip_add_irqchip(struct gpio_chip *gc,

diff --git a/drivers/gpio/gpiolib.h b/drivers/gpio/gpiolib.h
index 0271e747fb6e9d46a517f9fbbfbbfe0ab3324778..067197d61d57e420e667aab5bc8706a00b0cb90f 100644 (file)
--- a/drivers/gpio/gpiolib.h
+++ b/drivers/gpio/gpiolib.h
@@ -89,14 +89,13 @@ static inline struct gpio_device *to_gpio_device(struct device *dev)
        return container_of(dev, struct gpio_device, dev);
 }
 
-/* gpio suffixes used for ACPI and device tree lookup */
+/* GPIO suffixes used for ACPI and device tree lookup */
 extern const char *const gpio_suffixes[];
-extern const size_t gpio_suffix_count;
 
 #define for_each_gpio_property_name(propname, con_id)                                  \
-       for (unsigned int __i = 0;                                                      \
-            __i < gpio_suffix_count && ({                                              \
-                    const char *__gs = gpio_suffixes[__i];                             \
+       for (const char * const *__suffixes = gpio_suffixes;                            \
+            *__suffixes && ({                                                          \
+               const char *__gs = *__suffixes;                                         \
                                                                                        \
                if (con_id)                                                             \
                        snprintf(propname, sizeof(propname), "%s-%s", con_id, __gs);    \
@@ -104,7 +103,7 @@ extern const size_t gpio_suffix_count;
                        snprintf(propname, sizeof(propname), "%s", __gs);               \
                1;                                                                      \
             });                                                                        \
-            __i++)
+            __suffixes++)
 
 /**
  * struct gpio_array - Opaque descriptor for a structure of GPIO array attributes