diff options
author | Masahiro Yamada <masahiroy@kernel.org> | 2019-12-17 05:14:22 +0100 |
---|---|---|
committer | Masahiro Yamada <masahiroy@kernel.org> | 2020-01-06 18:18:44 +0100 |
commit | 6397d96ba5a52c57ee1831a4ddc3aab01bb02048 (patch) | |
tree | ce4dd71b3ab8070639985b22460fc3919572d964 /scripts | |
parent | kconfig: remove 'prompt' argument from menu_add_prop() (diff) | |
download | linux-6397d96ba5a52c57ee1831a4ddc3aab01bb02048.tar.xz linux-6397d96ba5a52c57ee1831a4ddc3aab01bb02048.zip |
kconfig: remove sym from struct property
struct property can reference to the symbol that it is associated with
by prop->menu->sym.
Fix up the one usage of prop->sym, and remove sym from struct property.
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/kconfig/expr.h | 1 | ||||
-rw-r--r-- | scripts/kconfig/parser.y | 2 | ||||
-rw-r--r-- | scripts/kconfig/symbol.c | 1 |
3 files changed, 1 insertions, 3 deletions
diff --git a/scripts/kconfig/expr.h b/scripts/kconfig/expr.h index 017843c9a4f4..6e102a3b8bd5 100644 --- a/scripts/kconfig/expr.h +++ b/scripts/kconfig/expr.h @@ -191,7 +191,6 @@ enum prop_type { struct property { struct property *next; /* next property - null if last */ - struct symbol *sym; /* the symbol for which the property is associated */ enum prop_type type; /* type of property */ const char *text; /* the prompt value - P_PROMPT, P_MENU, P_COMMENT */ struct expr_value visible; diff --git a/scripts/kconfig/parser.y b/scripts/kconfig/parser.y index af770bf758ad..708b6c4b13ca 100644 --- a/scripts/kconfig/parser.y +++ b/scripts/kconfig/parser.y @@ -660,7 +660,7 @@ static void print_symbol(FILE *out, struct menu *menu) break; case P_SYMBOL: fputs( " symbol ", out); - fprintf(out, "%s\n", prop->sym->name); + fprintf(out, "%s\n", prop->menu->sym->name); break; default: fprintf(out, " unknown prop %d!\n", prop->type); diff --git a/scripts/kconfig/symbol.c b/scripts/kconfig/symbol.c index f56eec5ea4c7..dbc5365d8bbc 100644 --- a/scripts/kconfig/symbol.c +++ b/scripts/kconfig/symbol.c @@ -1281,7 +1281,6 @@ struct property *prop_alloc(enum prop_type type, struct symbol *sym) prop = xmalloc(sizeof(*prop)); memset(prop, 0, sizeof(*prop)); prop->type = type; - prop->sym = sym; prop->file = current_file; prop->lineno = zconf_lineno(); |