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 <[email protected]> --- drivers/clk/renesas/rcar-cpg-lib.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/clk/renesas/rcar-cpg-lib.c b/drivers/clk/renesas/rcar-cpg-lib.c index 60ab2cb379e..5d1c8514adf 100644 --- a/drivers/clk/renesas/rcar-cpg-lib.c +++ b/drivers/clk/renesas/rcar-cpg-lib.c @@ -31,7 +31,9 @@ #define STPnHCK_TABLE (CPG_SDCKCR_STPnHCK >> SDnSRCFC_SHIFT) /* Non-constant mask variant of FIELD_GET/FIELD_PREP */ +#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)) static const struct clk_div_table cpg_sdh_div_table[] = { -- 2.53.0
