* [PATCH] gpio: fix incorrect merge of linux/gpio/driver.h
@ 2019-09-09 20:34 Arnd Bergmann
2019-09-09 23:00 ` Brian Masney
2019-09-10 10:16 ` Linus Walleij
0 siblings, 2 replies; 3+ messages in thread
From: Arnd Bergmann @ 2019-09-09 20:34 UTC (permalink / raw)
To: Linus Walleij, Bartosz Golaszewski
Cc: Arnd Bergmann, Masahiro Yamada, Hulk Robot, YueHaibing,
Hans Verkuil, Stephen Boyd, Brian Masney, Enrico Weigelt,
Johan Hovold, linux-gpio, linux-kernel
Two otherwise correct patches got merged incorrectly, which leads to
build problems when CONFIG_GPIOLIB is disabled:
include/linux/gpio/driver.h:722:19: error: static declaration of 'gpiochip_lock_as_irq' follows non-static declaration
static inline int gpiochip_lock_as_irq(struct gpio_chip *chip,
^
include/linux/gpio/driver.h:706:5: note: previous declaration is here
int gpiochip_lock_as_irq(struct gpio_chip *chip, unsigned int offset);
^
include/linux/gpio/driver.h:729:20: error: static declaration of 'gpiochip_unlock_as_irq' follows non-static declaration
static inline void gpiochip_unlock_as_irq(struct gpio_chip *chip,
^
include/linux/gpio/driver.h:707:6: note: previous declaration is here
void gpiochip_unlock_as_irq(struct gpio_chip *chip, unsigned int offset);
Fixes: 8a6abcd04e4c ("Merge tag 'gpio-v5.4-updates-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux into devel")
Fixes: 9091373ab7ea ("gpio: remove less important #ifdef around declarations")
Fixes: c7663fa2a663 ("gpio: Move gpiochip_lock/unlock_as_irq to gpio/driver.h")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
include/linux/gpio/driver.h | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/include/linux/gpio/driver.h b/include/linux/gpio/driver.h
index b74a3bee85e5..fb134ff20f6b 100644
--- a/include/linux/gpio/driver.h
+++ b/include/linux/gpio/driver.h
@@ -702,14 +702,14 @@ void gpiochip_free_own_desc(struct gpio_desc *desc);
void devprop_gpiochip_set_names(struct gpio_chip *chip,
const struct fwnode_handle *fwnode);
-/* lock/unlock as IRQ */
-int gpiochip_lock_as_irq(struct gpio_chip *chip, unsigned int offset);
-void gpiochip_unlock_as_irq(struct gpio_chip *chip, unsigned int offset);
-
#ifdef CONFIG_GPIOLIB
struct gpio_chip *gpiod_to_chip(const struct gpio_desc *desc);
+/* lock/unlock as IRQ */
+int gpiochip_lock_as_irq(struct gpio_chip *chip, unsigned int offset);
+void gpiochip_unlock_as_irq(struct gpio_chip *chip, unsigned int offset);
+
#else /* CONFIG_GPIOLIB */
static inline struct gpio_chip *gpiod_to_chip(const struct gpio_desc *desc)
--
2.20.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] gpio: fix incorrect merge of linux/gpio/driver.h
2019-09-09 20:34 [PATCH] gpio: fix incorrect merge of linux/gpio/driver.h Arnd Bergmann
@ 2019-09-09 23:00 ` Brian Masney
2019-09-10 10:16 ` Linus Walleij
1 sibling, 0 replies; 3+ messages in thread
From: Brian Masney @ 2019-09-09 23:00 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Linus Walleij, Bartosz Golaszewski, Masahiro Yamada, Hulk Robot,
YueHaibing, Hans Verkuil, Stephen Boyd, Enrico Weigelt,
Johan Hovold, linux-gpio, linux-kernel
On Mon, Sep 09, 2019 at 10:34:59PM +0200, Arnd Bergmann wrote:
> Two otherwise correct patches got merged incorrectly, which leads to
> build problems when CONFIG_GPIOLIB is disabled:
>
> include/linux/gpio/driver.h:722:19: error: static declaration of 'gpiochip_lock_as_irq' follows non-static declaration
> static inline int gpiochip_lock_as_irq(struct gpio_chip *chip,
> ^
> include/linux/gpio/driver.h:706:5: note: previous declaration is here
> int gpiochip_lock_as_irq(struct gpio_chip *chip, unsigned int offset);
> ^
> include/linux/gpio/driver.h:729:20: error: static declaration of 'gpiochip_unlock_as_irq' follows non-static declaration
> static inline void gpiochip_unlock_as_irq(struct gpio_chip *chip,
> ^
> include/linux/gpio/driver.h:707:6: note: previous declaration is here
> void gpiochip_unlock_as_irq(struct gpio_chip *chip, unsigned int offset);
>
> Fixes: 8a6abcd04e4c ("Merge tag 'gpio-v5.4-updates-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux into devel")
> Fixes: 9091373ab7ea ("gpio: remove less important #ifdef around declarations")
> Fixes: c7663fa2a663 ("gpio: Move gpiochip_lock/unlock_as_irq to gpio/driver.h")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Brian Masney <masneyb@onstation.org>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] gpio: fix incorrect merge of linux/gpio/driver.h
2019-09-09 20:34 [PATCH] gpio: fix incorrect merge of linux/gpio/driver.h Arnd Bergmann
2019-09-09 23:00 ` Brian Masney
@ 2019-09-10 10:16 ` Linus Walleij
1 sibling, 0 replies; 3+ messages in thread
From: Linus Walleij @ 2019-09-10 10:16 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Bartosz Golaszewski, Masahiro Yamada, Hulk Robot, YueHaibing,
Hans Verkuil, Stephen Boyd, Brian Masney, Enrico Weigelt,
Johan Hovold, open list:GPIO SUBSYSTEM, linux-kernel
On Mon, Sep 9, 2019 at 9:35 PM Arnd Bergmann <arnd@arndb.de> wrote:
> Two otherwise correct patches got merged incorrectly, which leads to
> build problems when CONFIG_GPIOLIB is disabled:
This has actually been fixed in my for-next branch for days,
the problem is that new next releases are not coming out
currently because of kernel summit, so the fix is not turning
up in next.
I have gotten something like 4 different fixes for this at this
point :D
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-09-10 10:16 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-09-09 20:34 [PATCH] gpio: fix incorrect merge of linux/gpio/driver.h Arnd Bergmann
2019-09-09 23:00 ` Brian Masney
2019-09-10 10:16 ` Linus Walleij
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).