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

net: hifemac: #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/net/hifemac.c b/drivers/net/hifemac.c
index 62182f922f8..a64665c4023 100644
--- a/drivers/net/hifemac.c
+++ b/drivers/net/hifemac.c
@@ -402,6 +402,7 @@ static void hisi_femac_get_strings(struct udevice *dev, u8 *data)
 }
 
 /* Non-constant mask variant of FIELD_GET/FIELD_PREP */
+#undef field_get
 #define field_get(_mask, _reg) (((_reg) & (_mask)) >> (ffs(_mask) - 1))
 
 static void hisi_femac_get_stats(struct udevice *dev, u64 *data)