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/expr.c b/scripts/kconfig/expr.c
index 6f98dbfe70cf..c8793d1d908f 100644
--- a/scripts/kconfig/expr.c
+++ b/scripts/kconfig/expr.c
@@ -955,14 +955,14 @@ tristate expr_calc_value(struct expr *e)
         case E_AND:
                 val1 = expr_calc_value(e->left.expr);
                 val2 = expr_calc_value(e->right.expr);
-                return E_AND(val1, val2);
+                return EXPR_AND(val1, val2);
         case E_OR:
                 val1 = expr_calc_value(e->left.expr);
                 val2 = expr_calc_value(e->right.expr);
-                return E_OR(val1, val2);
+                return EXPR_OR(val1, val2);
         case E_NOT:
                 val1 = expr_calc_value(e->left.expr);
-                return E_NOT(val1);
+                return EXPR_NOT(val1);
         case E_EQUAL:
                 sym_calc_value(e->left.sym);
                 sym_calc_value(e->right.sym);