From: Mikhail Kshevetskiy <mikhail.kshevetskiy@iopsys.eu>
Date: Fri, 3 Jul 2026 11:56:05 +0000 (+0300)
Subject: power: domain: renesas-r8a78000: #undef field_{get, prep}() before definition
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=40db9d313be6f6700ae1530b245e48dd1f60d51b;p=thirdparty%2Fu-boot.git

power: domain: renesas-r8a78000: #undef field_{get, prep}() before definition

Prepare for the advent of globally available common field_get() and
field_prep() macros by undefining the symbols before defining local
variants.  This prevents redefinition warnings from the C preprocessor
when introducing the common macros later.

Signed-off-by: Mikhail Kshevetskiy <mikhail.kshevetskiy@iopsys.eu>
---

diff --git a/drivers/power/domain/renesas-r8a78000-power-domain.c b/drivers/power/domain/renesas-r8a78000-power-domain.c
index d621373f90d..23fd35cd7f3 100644
--- a/drivers/power/domain/renesas-r8a78000-power-domain.c
+++ b/drivers/power/domain/renesas-r8a78000-power-domain.c
@@ -21,7 +21,9 @@
 #include <dt-bindings/power/r8a78000-power-scmi.h>
 #include <dt-bindings/reset/r8a78000-reset-scmi.h>
 
+#undef field_get
 #define field_get(_mask, _reg) (((_reg) & (_mask)) >> (ffs(_mask) - 1))
+#undef field_prep
 #define field_prep(_mask, _val) (((_val) << (ffs(_mask) - 1)) & (_mask))
 
 #define PKC_PROT_LOCK			0xa5a5a500