kconfig: remove SYMBOL_NO_WRITE flag

This flag is set to symbols that are not intended to be written
to the .config file.

Since commit b75b0a819af9 ("kconfig: change defconfig_list option to
environment variable"), SYMBOL_NO_WRITE is only set to choices.

Therefore, (sym->flags & SYMBOL_NO_WRITE) is equivalent to
sym_is_choice(sym). This flag is no longer necessary.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>

diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c
index bcce87658998c44d4ce273c26bcd40f9b7c72a53..5caec434e6f4ace5740c0df00a4c2e81f1a79a9b 100644 (file)
--- a/scripts/kconfig/confdata.c
+++ b/scripts/kconfig/confdata.c
@@ -502,7 +502,7 @@ int conf_read(const char *name)
 
        for_all_symbols(sym) {
                sym_calc_value(sym);
-               if (sym_is_choice(sym) || (sym->flags & SYMBOL_NO_WRITE))
+               if (sym_is_choice(sym))
                        continue;
                if (sym_has_value(sym) && (sym->flags & SYMBOL_WRITE)) {
                        /* check that calculated value agrees with saved value */
@@ -1007,7 +1007,7 @@ static int conf_touch_deps(void)
 
        for_all_symbols(sym) {
                sym_calc_value(sym);
-               if ((sym->flags & SYMBOL_NO_WRITE) || !sym->name)
+               if (sym_is_choice(sym))
                        continue;
                if (sym->flags & SYMBOL_WRITE) {
                        if (sym->flags & SYMBOL_DEF_AUTO) {

diff --git a/scripts/kconfig/expr.h b/scripts/kconfig/expr.h
index f646a98de0063a405beccab9b3fdf2ff697c822a..d965e427753eb7f7d94c40600603ddb21bef19e7 100644 (file)
--- a/scripts/kconfig/expr.h
+++ b/scripts/kconfig/expr.h
@@ -135,7 +135,6 @@ struct symbol {
 #define SYMBOL_WRITE      0x0200  /* write symbol to file (KCONFIG_CONFIG) */
 #define SYMBOL_CHANGED    0x0400  /* ? */
 #define SYMBOL_WRITTEN    0x0800  /* track info to avoid double-write to .config */
-#define SYMBOL_NO_WRITE   0x1000  /* Symbol for internal use only; it will not be written */
 #define SYMBOL_CHECKED    0x2000  /* used during dependency checking */
 #define SYMBOL_WARNED     0x8000  /* warning has been issued */
 

diff --git a/scripts/kconfig/gconf.c b/scripts/kconfig/gconf.c
index 13e2449ac83fadb9636795ff917fadc8f58c6f9d..67a27c497c4035da24258eb45a0fe7fc5536428d 100644 (file)
--- a/scripts/kconfig/gconf.c
+++ b/scripts/kconfig/gconf.c
@@ -91,8 +91,6 @@ static const char *dbg_sym_flags(int val)
                strcat(buf, "write/");
        if (val & SYMBOL_CHANGED)
                strcat(buf, "changed/");
-       if (val & SYMBOL_NO_WRITE)
-               strcat(buf, "no_write/");
 
        buf[strlen(buf) - 1] = '\0';
 

diff --git a/scripts/kconfig/parser.y b/scripts/kconfig/parser.y
index 69dc0c098acbdb49232b9342c92be3cf45804a9a..613fa8c9c2d042a4095389ba612d220ac0635a17 100644 (file)
--- a/scripts/kconfig/parser.y
+++ b/scripts/kconfig/parser.y
@@ -222,7 +222,7 @@ config_option: T_MODULES T_EOL
 choice: T_CHOICE T_EOL
 {
        struct symbol *sym = sym_lookup(NULL, 0);
-       sym->flags |= SYMBOL_NO_WRITE;
+
        menu_add_entry(sym);
        menu_add_expr(P_CHOICE, NULL, NULL);
        printd(DEBUG_PARSE, "%s:%d:choice\n", cur_filename, cur_lineno);

diff --git a/scripts/kconfig/symbol.c b/scripts/kconfig/symbol.c
index 8b34992ba5ed98ef267cde78ca111f39c0cc8e4f..b909c64f3bac899081f65609d4f2bbd92cd399cf 100644 (file)
--- a/scripts/kconfig/symbol.c
+++ b/scripts/kconfig/symbol.c
@@ -466,10 +466,9 @@ void sym_calc_value(struct symbol *sym)
                        if (sym->flags & SYMBOL_CHANGED)
                                sym_set_changed(choice_sym);
                }
-       }
 
-       if (sym->flags & SYMBOL_NO_WRITE)
                sym->flags &= ~SYMBOL_WRITE;
+       }
 
        if (sym->flags & SYMBOL_NEED_SET_CHOICE_VALUES)
                set_all_choice_values(sym);