| Message ID | 20200817202356.11598-1-festevam@gmail.com |
|---|---|
| State | Accepted |
| Commit | 17621758e53f0e6bf1ac469cca2a59fa6457d205 |
| Headers | show |
| Series | media: fsl-viu: Do not redefine out_be32()/in_be32() for CONFIG_M68K | expand |
diff --git a/drivers/media/platform/fsl-viu.c b/drivers/media/platform/fsl-viu.c index 84633a3b8475..4f2a0f992905 100644 --- a/drivers/media/platform/fsl-viu.c +++ b/drivers/media/platform/fsl-viu.c @@ -32,7 +32,7 @@ #define VIU_VERSION "0.5.1" /* Allow building this driver with COMPILE_TEST */ -#if !defined(CONFIG_PPC) && !defined(CONFIG_MICROBLAZE) +#if !defined(CONFIG_PPC) && !defined(CONFIG_MICROBLAZE) && !defined(CONFIG_M68K) #define out_be32(v, a) iowrite32be(a, (void __iomem *)v) #define in_be32(a) ioread32be((void __iomem *)a) #endif
The following W=1 build warning is seen on a m68k: drivers/media/platform/fsl-viu.c: At top level: drivers/media/platform/fsl-viu.c:36: warning: "out_be32" redefined 36 | #define out_be32(v, a) iowrite32be(a, (void __iomem *)v) | In file included from ./arch/m68k/include/asm/io_mm.h:25, from ./arch/m68k/include/asm/io.h:8, from ./include/linux/io.h:13, from ./include/linux/irq.h:20, from ./include/asm-generic/hardirq.h:13, from ./arch/m68k/include/generated/asm/hardirq.h:1, from ./include/linux/hardirq.h:9, from ./include/linux/interrupt.h:11, from drivers/media/platform/fsl-viu.c:17: ./arch/m68k/include/asm/raw_io.h:32: note: this is the location of the previous definition 32 | #define out_be32(addr,l) (void)((*(__force volatile u32 *) (addr)) = (l)) Avoid the out_be32() and in_be32() redefinitions when building for CONFIG_M68K in the same way we currently do for CONFIG_PPC and CONFIG_MICROBLAZE. Reported-by: kernel test robot <lkp@intel.com> Signed-off-by: Fabio Estevam <festevam@gmail.com> --- drivers/media/platform/fsl-viu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)