From: Geert Uytterhoeven Date: Thu, 6 Nov 2025 13:33:51 +0000 (+0100) Subject: EDAC/ie31200: #undef field_get() before local definition X-Git-Tag: v6.19-rc1~87^2~26 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d51b09a0feb63029be64226502cbcf53adc434b0;p=thirdparty%2Fkernel%2Flinux.git EDAC/ie31200: #undef field_get() before local definition Prepare for the advent of a globally available common field_get() macro by undefining the symbol before defining a local variant. This prevents redefinition warnings from the C preprocessor when introducing the common macro later. Suggested-by: Yury Norov Signed-off-by: Geert Uytterhoeven Reviewed-by: Qiuxu Zhuo Signed-off-by: Yury Norov (NVIDIA) --- diff --git a/drivers/edac/ie31200_edac.c b/drivers/edac/ie31200_edac.c index 5a080ab65476d..72290f430126c 100644 --- a/drivers/edac/ie31200_edac.c +++ b/drivers/edac/ie31200_edac.c @@ -140,6 +140,7 @@ #define IE31200_CAPID0_ECC BIT(1) /* Non-constant mask variant of FIELD_GET() */ +#undef field_get #define field_get(_mask, _reg) (((_reg) & (_mask)) >> (ffs(_mask) - 1)) static int nr_channels;