]> git.itanic.dy.fi Git - linux-stable/commitdiff
kconfig: remove unneeded symbol_empty variable
authorMasahiro Yamada <masahiroy@kernel.org>
Sat, 25 Nov 2023 16:35:58 +0000 (01:35 +0900)
committerMasahiro Yamada <masahiroy@kernel.org>
Sun, 3 Dec 2023 10:00:19 +0000 (19:00 +0900)
This is used only for initializing other variables.

Use the empty string "" directly.

Please note newval.tri is unused for S_INT/HEX/STRING.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
scripts/kconfig/symbol.c

index a76925b46ce6309439ec0a554775dbbf2dd445cd..f7075d148ac79e3b4120bb383a5e3d22d55fe2bc 100644 (file)
@@ -29,12 +29,6 @@ struct symbol symbol_no = {
        .flags = SYMBOL_CONST|SYMBOL_VALID,
 };
 
-static struct symbol symbol_empty = {
-       .name = "",
-       .curr = { "", no },
-       .flags = SYMBOL_VALID,
-};
-
 struct symbol *modules_sym;
 static tristate modules_val;
 
@@ -346,7 +340,7 @@ void sym_calc_value(struct symbol *sym)
        case S_INT:
        case S_HEX:
        case S_STRING:
-               newval = symbol_empty.curr;
+               newval.val = "";
                break;
        case S_BOOLEAN:
        case S_TRISTATE:
@@ -697,13 +691,12 @@ const char *sym_get_string_default(struct symbol *sym)
 {
        struct property *prop;
        struct symbol *ds;
-       const char *str;
+       const char *str = "";
        tristate val;
 
        sym_calc_visibility(sym);
        sym_calc_value(modules_sym);
        val = symbol_no.curr.tri;
-       str = symbol_empty.curr.val;
 
        /* If symbol has a default value look it up */
        prop = sym_get_default_prop(sym);