[PATCH] backport: declare GPIO own_desc functions if GPIOLIB is not defined

From: Luca Coelho <luca@coelho.fi>
To: backports@vger.kernel.org
Cc: johannes@sipsolutions.net, hauke@hauke-m.de
Subject: [PATCH] backport: declare GPIO own_desc functions if GPIOLIB is not defined
Date: Wed, 16 Dec 2020 16:26:34 +0200	[thread overview]
Message-ID: <20201216142634.1625546-1-luca@coelho.fi> (raw)

From: Luca Coelho <luciano.coelho@intel.com>

In kernels older than v5.4, the gpiochip_request_own_desc() and the
gpiochip_free_own_desc() functions are declared inside a
CONFIG_GPIOLIB ifdef, so we need to declare them in our implementation
to avoid compilation problems.

Change-Id: Ic6da0d7ff9d99c64d110da63fb950fb555fd2782
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
---
 backport/compat/backport-5.3.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/backport/compat/backport-5.3.c b/backport/compat/backport-5.3.c
index f501448e24cd..46e6a11d8da3 100644
--- a/backport/compat/backport-5.3.c
+++ b/backport/compat/backport-5.3.c
@@ -45,6 +45,17 @@ static int gpiod_configure_flags(struct gpio_desc *desc, const char *con_id,
 }
 
 #undef gpiochip_request_own_desc
+
+/* In kernels older than 5.4, these function declarations are inside a
+ * CONFIG_GPIOLIB ifdef, so we need to declare them here.
+ */
+#ifndef CONFIG_GPIOLIB
+extern struct gpio_desc *gpiochip_request_own_desc(struct gpio_chip *chip,
+						   u16 hwnum,
+						   const char *label);
+void gpiochip_free_own_desc(struct gpio_desc *desc);
+#endif /* CONFIG_GPIOLIB */
+
 struct gpio_desc *backport_gpiochip_request_own_desc(struct gpio_chip *gc,
 					    unsigned int hwnum,
 					    const char *label,
-- 
2.29.2

--
To unsubscribe from this list: send the line "unsubscribe backports" in
