summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabio Estevam <festevam@gmail.com>2020-08-17 22:23:56 +0200
committerMauro Carvalho Chehab <mchehab+huawei@kernel.org>2020-08-29 08:07:48 +0200
commit17621758e53f0e6bf1ac469cca2a59fa6457d205 (patch)
tree4bc0b3516f64175e82bc17f61f92e88c6204bc7e
parentfd1a97a23f9a4583120a603637d16f98503ec282 (diff)
media: fsl-viu: Do not redefine out_be32()/in_be32() for CONFIG_M68K
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> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
-rw-r--r--drivers/media/platform/fsl-viu.c2
1 files changed, 1 insertions, 1 deletions
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