Messages in this thread | | | Date | Tue, 12 Jul 2022 11:38:07 +0100 | From | Marc Zyngier <> | Subject | Re: [PATCH] gpio: thunderx: Don't directly include asm-generic/msi.h |
| |
On 2022-07-12 11:22, Bartosz Golaszewski wrote: > On Mon, Jul 11, 2022 at 10:13 AM Marc Zyngier <maz@kernel.org> wrote: >> >> On architectures that require it, asm-generic/msi.h is already >> dragged in by the higher level include files, and is commonly >> refered to as 'asm/msi.h'. >> >> It is also architecture specific, and breaks compilation in >> a pretty bad way now that linux/gpio/driver.h includes asm/msi.h >> (which drags a conflicting but nonetheless correct version >> of msi_alloc_info_t on x86). >> >> Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> >> Signed-off-by: Marc Zyngier <maz@kernel.org> >> Link: >> https://lore.kernel.org/r/20220711154252.4b88a601@canb.auug.org.au >> Fixes: 91a29af413de ("gpio: Remove dynamic allocation from >> populate_parent_alloc_arg()") >> Cc: Bartosz Golaszewski <brgl@bgdev.pl> >> Cc: Linus Walleij <linus.walleij@linaro.org> >> --- >> drivers/gpio/gpio-thunderx.c | 2 -- >> 1 file changed, 2 deletions(-) >> >> diff --git a/drivers/gpio/gpio-thunderx.c >> b/drivers/gpio/gpio-thunderx.c >> index e1dedbca0c85..cc62c6e64103 100644 >> --- a/drivers/gpio/gpio-thunderx.c >> +++ b/drivers/gpio/gpio-thunderx.c >> @@ -15,8 +15,6 @@ >> #include <linux/module.h> >> #include <linux/pci.h> >> #include <linux/spinlock.h> >> -#include <asm-generic/msi.h> >> - >> >> #define GPIO_RX_DAT 0x0 >> #define GPIO_TX_SET 0x8 >> -- >> 2.34.1 >> > > Applied for fixes, thanks!
I'm not sure this is correct on its own without the original patch mentioned in the Fixes: tag...
Thanks,
M. -- Jazz is not dead. It just smells funny...
| |