kconfig: rename E_OR & friends to avoid name clash

We had macros named the same as a set of enumeration values.
It is legal code but very confusing to read - so rename
the macros from E_* to EXPR_*

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Cc: Roman Zippel <zippel@linux-m68k.org>

1 files changed, 3 insertions, 3 deletions

diff --git a/scripts/kconfig/symbol.c b/scripts/kconfig/symbol.c
index c35dcc5d6189..add068c8e513 100644
--- a/scripts/kconfig/symbol.c
+++ b/scripts/kconfig/symbol.c
@@ -199,7 +199,7 @@ static void sym_calc_visibility(struct symbol *sym)
         tri = no;
         for_all_prompts(sym, prop) {
                 prop->visible.tri = expr_calc_value(prop->visible.expr);
-                tri = E_OR(tri, prop->visible.tri);
+                tri = EXPR_OR(tri, prop->visible.tri);
         }
         if (tri == mod && (sym->type != S_TRISTATE || modules_val == no))
                 tri = yes;
@@ -303,7 +303,7 @@ void sym_calc_value(struct symbol *sym)
                 if (sym_is_choice_value(sym) && sym->visible == yes) {
                         prop = sym_get_choice_prop(sym);
                         newval.tri = (prop_get_symbol(prop)->curr.val == sym) ? yes : no;
-                } else if (E_OR(sym->visible, sym->rev_dep.tri) != no) {
+                } else if (EXPR_OR(sym->visible, sym->rev_dep.tri) != no) {
                         sym->flags |= SYMBOL_WRITE;
                         if (sym_has_value(sym))
                                 newval.tri = sym->def[S_DEF_USER].tri;
@@ -312,7 +312,7 @@ void sym_calc_value(struct symbol *sym)
                                 if (prop)
                                         newval.tri = expr_calc_value(prop->expr);
                         }
-                        newval.tri = E_OR(E_AND(newval.tri, sym->visible), sym->rev_dep.tri);
+                        newval.tri = EXPR_OR(EXPR_AND(newval.tri, sym->visible), sym->rev_dep.tri);
                 } else if (!sym_is_choice(sym)) {
                         prop = sym_get_default_prop(sym);
                         if (prop) {