media: fsl-viu: Use proper check for presence of {out,in}_be32()
Subsystems (2)
PATCH 1/1 media: fsl-viu: Use proper check for presence of {out,in}_be32()
When compile-testing on m68k/randconfig:
drivers/media/platform/fsl-viu.c: In function 'viu_start_dma':
drivers/media/platform/fsl-viu.c:253:2: error: implicit declaration of function 'out_be32' [-Werror=implicit-function-declaration] drivers/media/platform/fsl-viu.c: In function 'viu_stop_dma':
drivers/media/platform/fsl-viu.c:266:15: error: implicit declaration of function 'in_be32' [-Werror=implicit-function-declaration]
Fix this by replacing the checks for PowerPC, Microblaze, and m68k by checks for the presence of {out,in}_be32().
As PowerPC implements the be32 accessors using inline functions instead of macros, identity definitions are added for all accessors to make the above checks work.
---
Compile-tested on m68k, microblaze, and powerpc. Assembler output before/after compared for powerpc.
v2:
- Add Reviewed-by,
- s/definions/definitions/,
- Update for commits 6898dd580a045341 ("media: media/platform:
fsl-viu.c: fix build for MICROBLAZE") and 17621758e53f0e6b ("media:
fsl-viu: Do not redefine out_be32()/in_be32() for CONFIG_M68K"), which added checks for Microblaze and m68k (the latter is not sufficient, cfr. the report from the kernel test robot).
v1: https://lore.kernel.org/lkml/[email protected]/
--- arch/powerpc/include/asm/io.h | 14 ++++++++++++++ drivers/media/platform/fsl-viu.c | 4 +++- 2 files changed, 17 insertions(+), 1 deletion(-)
arch/powerpc/include/asm/io.h +14 -0
@@ -194,6 +194,20 @@ static inline void out_be64(volatile u64 __iomem *addr, u64 val)#endif #endif /* __powerpc64__ */ +#define in_be16 in_be16 +#define in_be32 in_be32 +#define in_be64 in_be64 +#define in_le16 in_le16 +#define in_le32 in_le32 +#define in_le64 in_le64 + +#define out_be16 out_be16 +#define out_be32 out_be32 +#define out_be64 out_be64 +#define out_le16 out_le16 +#define out_le32 out_le32 +#define out_le64 out_le64 +/* * Low level IO stream instructions are defined out of line for now */
drivers/media/platform/fsl-viu.c +3 -1
@@ -32,8 +32,10 @@#define VIU_VERSION "0.5.1"/* Allow building this driver with COMPILE_TEST */ -#if !defined(CONFIG_PPC ) && !defined(CONFIG_MICROBLAZE ) && !defined(CONFIG_M68K ) +#ifndef out_be32#define out_be32 (v, a) iowrite32be(a, (void __iomem *)v) +#endif +#ifndef in_be32#define in_be32 (a) ioread32be((void __iomem *)a)#endif
Signature · 1 line
2.25.1