gpiolib: Move validate_desc() and Co upper in the code

Move validate_desc() and Co upper in the code to be able to use
in the further changes.

Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20250416095645.2027695-6-andriy.shevchenko@linux.intel.com
Signed-off-by: Bartosz Golaszewski <brgl@bgdev.pl>

diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
index 7ab408b448939d633f554c3fb25ad71bd7d630bb..297a124a5e44165fba0ebaa4916690bf5fcd9902 100644 (file)
--- a/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c
@@ -356,6 +356,37 @@ static int gpiochip_find_base_unlocked(u16 ngpio)
        }
 }
 
+/*
+ * This descriptor validation needs to be inserted verbatim into each
+ * function taking a descriptor, so we need to use a preprocessor
+ * macro to avoid endless duplication. If the desc is NULL it is an
+ * optional GPIO and calls should just bail out.
+ */
+static int validate_desc(const struct gpio_desc *desc, const char *func)
+{
+       if (!desc)
+               return 0;
+
+       if (IS_ERR(desc)) {
+               pr_warn("%s: invalid GPIO (errorpointer: %pe)\n", func, desc);
+               return PTR_ERR(desc);
+       }
+
+       return 1;
+}
+
+#define VALIDATE_DESC(desc) do { \
+       int __valid = validate_desc(desc, __func__); \
+       if (__valid <= 0) \
+               return __valid; \
+       } while (0)
+
+#define VALIDATE_DESC_VOID(desc) do { \
+       int __valid = validate_desc(desc, __func__); \
+       if (__valid <= 0) \
+               return; \
+       } while (0)
+
 static int gpiochip_get_direction(struct gpio_chip *gc, unsigned int offset)
 {
        int ret;
@@ -2431,37 +2462,6 @@ out_clear_bit:
        return ret;
 }
 
-/*
- * This descriptor validation needs to be inserted verbatim into each
- * function taking a descriptor, so we need to use a preprocessor
- * macro to avoid endless duplication. If the desc is NULL it is an
- * optional GPIO and calls should just bail out.
- */
-static int validate_desc(const struct gpio_desc *desc, const char *func)
-{
-       if (!desc)
-               return 0;
-
-       if (IS_ERR(desc)) {
-               pr_warn("%s: invalid GPIO (errorpointer: %pe)\n", func, desc);
-               return PTR_ERR(desc);
-       }
-
-       return 1;
-}
-
-#define VALIDATE_DESC(desc) do { \
-       int __valid = validate_desc(desc, __func__); \
-       if (__valid <= 0) \
-               return __valid; \
-       } while (0)
-
-#define VALIDATE_DESC_VOID(desc) do { \
-       int __valid = validate_desc(desc, __func__); \
-       if (__valid <= 0) \
-               return; \
-       } while (0)
-
 int gpiod_request(struct gpio_desc *desc, const char *label)
 {
        int ret = -EPROBE_DEFER;