Re: [PATCH] gpio: thunderx: Don't directly include asm-generic/msi.h

From: Bartosz Golaszewski
Date: Tue Jul 12 2022 - 06:22:25 EST


On Mon, Jul 11, 2022 at 10:13 AM Marc Zyngier <maz@xxxxxxxxxx> 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@xxxxxxxxxxxxxxxx>
> Signed-off-by: Marc Zyngier <maz@xxxxxxxxxx>
> Link: https://lore.kernel.org/r/20220711154252.4b88a601@xxxxxxxxxxxxxxxx
> Fixes: 91a29af413de ("gpio: Remove dynamic allocation from populate_parent_alloc_arg()")
> Cc: Bartosz Golaszewski <brgl@xxxxxxxx>
> Cc: Linus Walleij <linus.walleij@xxxxxxxxxx>
> ---
> 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!

Bart