[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20230124013138.358595-1-pierluigi.p@variscite.com>
Date: Tue, 24 Jan 2023 02:31:38 +0100
From: Pierluigi Passaro <pierluigi.p@...iscite.com>
To: linus.walleij@...aro.org, brgl@...ev.pl,
yamada.masahiro@...ionext.com, linux-gpio@...r.kernel.org,
linux-kernel@...r.kernel.org, sfr@...b.auug.org.au
Cc: eran.m@...iscite.com, nate.d@...iscite.com,
francesco.f@...iscite.com, pierluigi.passaro@...il.com,
Pierluigi Passaro <pierluigi.p@...iscite.com>,
kernel test robot <lkp@...el.com>
Subject: [PATCH v3] gpiolib: fix linker errors when GPIOLIB is disabled
Both the functions gpiochip_request_own_desc and
gpiochip_free_own_desc are exported from
drivers/gpio/gpiolib.c
but this file is compiled only when CONFIG_GPIOLIB is enabled.
Move the prototypes under "#ifdef CONFIG_GPIOLIB" and provide
reasonable definitions and includes in the "#else" branch.
Fixes: 9091373ab7ea ("gpio: remove less important #ifdef around declarations")
Signed-off-by: Pierluigi Passaro <pierluigi.p@...iscite.com>
Reported-by: kernel test robot <lkp@...el.com>
---
Changes in v2:
- add Fixes tag
Changes in v3:
- add includes to fix builds against x86_64-defconfig
include/linux/gpio/driver.h | 23 +++++++++++++++++++++--
1 file changed, 21 insertions(+), 2 deletions(-)
diff --git a/include/linux/gpio/driver.h b/include/linux/gpio/driver.h
index 44783fc16125..e00eaba724dc 100644
--- a/include/linux/gpio/driver.h
+++ b/include/linux/gpio/driver.h
@@ -758,6 +758,8 @@ gpiochip_remove_pin_ranges(struct gpio_chip *gc)
#endif /* CONFIG_PINCTRL */
+#ifdef CONFIG_GPIOLIB
+
struct gpio_desc *gpiochip_request_own_desc(struct gpio_chip *gc,
unsigned int hwnum,
const char *label,
@@ -765,8 +767,6 @@ struct gpio_desc *gpiochip_request_own_desc(struct gpio_chip *gc,
enum gpiod_flags dflags);
void gpiochip_free_own_desc(struct gpio_desc *desc);
-#ifdef CONFIG_GPIOLIB
-
/* lock/unlock as IRQ */
int gpiochip_lock_as_irq(struct gpio_chip *gc, unsigned int offset);
void gpiochip_unlock_as_irq(struct gpio_chip *gc, unsigned int offset);
@@ -776,6 +776,25 @@ struct gpio_chip *gpiod_to_chip(const struct gpio_desc *desc);
#else /* CONFIG_GPIOLIB */
+#include <linux/gpio/machine.h>
+#include <linux/gpio/consumer.h>
+
+static inline struct gpio_desc *gpiochip_request_own_desc(struct gpio_chip *gc,
+ unsigned int hwnum,
+ const char *label,
+ enum gpio_lookup_flags lflags,
+ enum gpiod_flags dflags)
+{
+ /* GPIO can never have been requested */
+ WARN_ON(1);
+ return ERR_PTR(-ENODEV);
+}
+
+static inline void gpiochip_free_own_desc(struct gpio_desc *desc)
+{
+ WARN_ON(1);
+}
+
static inline struct gpio_chip *gpiod_to_chip(const struct gpio_desc *desc)
{
/* GPIO can never have been requested */
--
2.34.1
Powered by blists - more mailing lists