[PATCH] media: s5p-jpeg: change "RST" to "RSET" to fix build warnings
flat view
STALE1868d
From: Randy Dunlap <rdunlap@infradead.org>
Date: 2021-09-05 23:57:23
Also in:
linux-media, lkml
The use of a macro named 'RST' conflicts with one of the same name
in arch/mips/include/asm/mach-rc32434/rb.h. This causes build
warnings on some MIPS builds.
Change the use of RST to the name RSET.
Fixes these build warnings:
In file included from ../drivers/media/platform/s5p-jpeg/jpeg-hw-exynos3250.c:14:
../drivers/media/platform/s5p-jpeg/jpeg-core.h:43: warning: "RST" redefined
43 | #define RST 0xd0
|
../arch/mips/include/asm/mach-rc32434/rb.h:13: note: this is the location of the previous definition
13 | #define RST (1 << 15)
In file included from ../drivers/media/platform/s5p-jpeg/jpeg-hw-s5p.c:13:
../drivers/media/platform/s5p-jpeg/jpeg-core.h:43: warning: "RST" redefined
43 | #define RST 0xd0
../arch/mips/include/asm/mach-rc32434/rb.h:13: note: this is the location of the previous definition
13 | #define RST (1 << 15)
In file included from ../drivers/media/platform/s5p-jpeg/jpeg-hw-exynos4.c:12:
../drivers/media/platform/s5p-jpeg/jpeg-core.h:43: warning: "RST" redefined
43 | #define RST 0xd0
../arch/mips/include/asm/mach-rc32434/rb.h:13: note: this is the location of the previous definition
13 | #define RST (1 << 15)
In file included from ../drivers/media/platform/s5p-jpeg/jpeg-core.c:31:
../drivers/media/platform/s5p-jpeg/jpeg-core.h:43: warning: "RST" redefined
43 | #define RST 0xd0
../arch/mips/include/asm/mach-rc32434/rb.h:13: note: this is the location of the previous definition
13 | #define RST (1 << 15)
Fixes: bb677f3ac434 ("[media] Exynos4 JPEG codec v4l2 driver")
Reported-by: kernel test robot <redacted>
Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
Cc: Mauro Carvalho Chehab <mchehab@kernel.org>
Cc: linux-media@vger.kernel.org
Cc: Andrzej Pietrasiewicz <andrzejtp2010@gmail.com>
Cc: Jacek Anaszewski <jacek.anaszewski@gmail.com>
Cc: Sylwester Nawrocki <s.nawrocki@samsung.com>
Cc: linux-arm-kernel@lists.infradead.org
---
drivers/media/platform/s5p-jpeg/jpeg-core.c | 2 +-
drivers/media/platform/s5p-jpeg/jpeg-core.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--- linux-next-20210903.orig/drivers/media/platform/s5p-jpeg/jpeg-core.c
+++ linux-next-20210903/drivers/media/platform/s5p-jpeg/jpeg-core.c@@ -1203,7 +1203,7 @@ static bool s5p_jpeg_parse_hdr(struct s5 break; /* skip payload-less markers */ - case RST ... RST + 7: + case RSET ... RSET + 7: case SOI: case EOI: case TEM: --- linux-next-20210903.orig/drivers/media/platform/s5p-jpeg/jpeg-core.h +++ linux-next-20210903/drivers/media/platform/s5p-jpeg/jpeg-core.h
@@ -40,7 +40,7 @@ #define TEM 0x01 #define SOF0 0xc0 #define DHT 0xc4 -#define RST 0xd0 +#define RSET 0xd0 #define SOI 0xd8 #define EOI 0xd9 #define SOS 0xda
_______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel