| Message ID | 20241203172631.1647792-2-u.kleine-koenig@baylibre.com |
|---|---|
| State | New |
| Headers | show |
| Series | gpio: idio-16: Actually make use of the GPIO_IDIO_16 symbol namespace | expand |
On Tue, Dec 03, 2024 at 06:26:30PM +0100, Uwe Kleine-König wrote: > DEFAULT_SYMBOL_NAMESPACE must already be defined when <linux/export.h> > is included. So move the define above the include block. > > Fixes: b9b1fc1ae119 ("gpio: idio-16: Introduce the ACCES IDIO-16 GPIO library module") > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@baylibre.com> Acked-by: William Breathitt Gray <wbg@kernel.org>
On Tue, Dec 3, 2024 at 6:26 PM Uwe Kleine-König <u.kleine-koenig@baylibre.com> wrote: > > DEFAULT_SYMBOL_NAMESPACE must already be defined when <linux/export.h> > is included. So move the define above the include block. > > Fixes: b9b1fc1ae119 ("gpio: idio-16: Introduce the ACCES IDIO-16 GPIO library module") > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@baylibre.com> > --- > Hello, > > this is based on current Linus Torvalds's master branch and depends on > the topmost commit there. > Can you rebase it on top of the gpio/for-current branch? It doesn't apply to my tree in its current form. Bart
Hello Bartosz, On Mon, Dec 09, 2024 at 10:28:14AM +0100, Bartosz Golaszewski wrote: > On Tue, Dec 3, 2024 at 6:26 PM Uwe Kleine-König > <u.kleine-koenig@baylibre.com> wrote: > > > > DEFAULT_SYMBOL_NAMESPACE must already be defined when <linux/export.h> > > is included. So move the define above the include block. > > > > Fixes: b9b1fc1ae119 ("gpio: idio-16: Introduce the ACCES IDIO-16 GPIO library module") > > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@baylibre.com> > > --- > > Hello, > > > > this is based on current Linus Torvalds's master branch and depends on > > the topmost commit there. > > Can you rebase it on top of the gpio/for-current branch? It doesn't > apply to my tree in its current form. Your tree is based on v6.13-rc1. If you keep it that way and you apply my patch that you ask me to rebase there, it will conflict when it's pulled into Linus's tree as ceb8bf2ceaa7 in his tree touches that file, too So if I fix the merge conflict now to make my patch applicable to your tree, you or one of the Linuses has to do the reverse resolution again at a later point in time. Is that really what you want? An easy way out is to backmerge v6.13-rc2 into your tree (or rebase on -rc2) and only then apply my patch. Best regards Uwe
On Tue, Dec 10, 2024 at 11:15 AM Uwe Kleine-König <u.kleine-koenig@baylibre.com> wrote: > > Hello Bartosz, > > On Mon, Dec 09, 2024 at 10:28:14AM +0100, Bartosz Golaszewski wrote: > > On Tue, Dec 3, 2024 at 6:26 PM Uwe Kleine-König > > <u.kleine-koenig@baylibre.com> wrote: > > > > > > DEFAULT_SYMBOL_NAMESPACE must already be defined when <linux/export.h> > > > is included. So move the define above the include block. > > > > > > Fixes: b9b1fc1ae119 ("gpio: idio-16: Introduce the ACCES IDIO-16 GPIO library module") > > > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@baylibre.com> > > > --- > > > Hello, > > > > > > this is based on current Linus Torvalds's master branch and depends on > > > the topmost commit there. > > > > Can you rebase it on top of the gpio/for-current branch? It doesn't > > apply to my tree in its current form. > > Your tree is based on v6.13-rc1. If you keep it that way and you apply > my patch that you ask me to rebase there, it will conflict when it's > pulled into Linus's tree as ceb8bf2ceaa7 in his tree touches that file, > too > > So if I fix the merge conflict now to make my patch applicable to your > tree, you or one of the Linuses has to do the reverse resolution again > at a later point in time. Is that really what you want? > > An easy way out is to backmerge v6.13-rc2 into your tree (or rebase on > -rc2) and only then apply my patch. > Ah, I didn't get that from the commit message. Let's do it this way. Bart
From: Bartosz Golaszewski <bartosz.golaszewski@linaro.org> On Tue, 03 Dec 2024 18:26:30 +0100, Uwe Kleine-König wrote: > DEFAULT_SYMBOL_NAMESPACE must already be defined when <linux/export.h> > is included. So move the define above the include block. > > Applied, thanks! [1/1] gpio: idio-16: Actually make use of the GPIO_IDIO_16 symbol namespace commit: 9ac4b58fcef0f9fc03fa6e126a5f53c1c71ada8a Best regards,
diff --git a/drivers/gpio/gpio-idio-16.c b/drivers/gpio/gpio-idio-16.c index 2c9512589297..0103be977c66 100644 --- a/drivers/gpio/gpio-idio-16.c +++ b/drivers/gpio/gpio-idio-16.c @@ -3,6 +3,9 @@ * GPIO library for the ACCES IDIO-16 family * Copyright (C) 2022 William Breathitt Gray */ + +#define DEFAULT_SYMBOL_NAMESPACE "GPIO_IDIO_16" + #include <linux/bits.h> #include <linux/device.h> #include <linux/err.h> @@ -14,8 +17,6 @@ #include "gpio-idio-16.h" -#define DEFAULT_SYMBOL_NAMESPACE "GPIO_IDIO_16" - #define IDIO_16_DAT_BASE 0x0 #define IDIO_16_OUT_BASE IDIO_16_DAT_BASE #define IDIO_16_IN_BASE (IDIO_16_DAT_BASE + 1)
DEFAULT_SYMBOL_NAMESPACE must already be defined when <linux/export.h> is included. So move the define above the include block. Fixes: b9b1fc1ae119 ("gpio: idio-16: Introduce the ACCES IDIO-16 GPIO library module") Signed-off-by: Uwe Kleine-König <u.kleine-koenig@baylibre.com> --- Hello, this is based on current Linus Torvalds's master branch and depends on the topmost commit there. Best regards Uwe drivers/gpio/gpio-idio-16.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) base-commit: ceb8bf2ceaa77fe222fe8fe32cb7789c9099ddf1