From: Masahiro Yamada <masahiroy@kernel.org>
Date: Tue, 17 Dec 2019 04:14:22 +0000 (+0900)
Subject: kconfig: remove sym from struct property
X-Git-Url: https://jxself.org/git/?a=commitdiff_plain;h=74e13ad714192bc1a297e62adc04d1bb7ee30a02;p=carl9170fw.git

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>
Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
---

diff --git a/config/expr.h b/config/expr.h
index 017843c..6e102a3 100644
--- a/config/expr.h
+++ b/config/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/config/parser.y b/config/parser.y
index af770bf..708b6c4 100644
--- a/config/parser.y
+++ b/config/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/config/symbol.c b/config/symbol.c
index f56eec5..dbc5365 100644
--- a/config/symbol.c
+++ b/config/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();