linux-kernel - [PATCH] media: s5p-jpeg: change "RST" to "RSET" to fix build warnings

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20210905235715.12154-1-rdunlap@infradead.org>
Date:   Sun,  5 Sep 2021 16:57:15 -0700
From:   Randy Dunlap <rdunlap@...radead.org>
To:     linux-kernel@...r.kernel.org
Cc:     Randy Dunlap <rdunlap@...radead.org>,
        kernel test robot <lkp@...el.com>,
        Mauro Carvalho Chehab <mchehab@...nel.org>,
        linux-media@...r.kernel.org,
        Andrzej Pietrasiewicz <andrzejtp2010@...il.com>,
        Jacek Anaszewski <jacek.anaszewski@...il.com>,
        Sylwester Nawrocki <s.nawrocki@...sung.com>,
        linux-arm-kernel@...ts.infradead.org
Subject: [PATCH] media: s5p-jpeg: change "RST" to "RSET" to fix build warnings

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 <lkp@...el.com>
Signed-off-by: Randy Dunlap <rdunlap@...radead.org>
Cc: Mauro Carvalho Chehab <mchehab@...nel.org>
Cc: linux-media@...r.kernel.org
Cc: Andrzej Pietrasiewicz <andrzejtp2010@...il.com>
Cc: Jacek Anaszewski <jacek.anaszewski@...il.com>
Cc: Sylwester Nawrocki <s.nawrocki@...sung.com>
Cc: linux-arm-kernel@...ts.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