commit adf7c5bd0674b04588246e444efef9987b2f1a6b
author Masahiro Yamada <masahiroy@kernel.org> Tue Dec 17 13:14:23 2019 +0900
committer Masahiro Yamada <masahiroy@kernel.org> Tue Jan 07 02:18:44 2020 +0900
tree 4d312ce2693fb3efd480c788b42c692bc77bee81
parent 6397d96ba5a52c57ee1831a4ddc3aab01bb02048

kconfig: squash prop_alloc() into menu_add_prop()

prop_alloc() is only called from menu_add_prop(). Squash it.

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

scripts/kconfig/menu.c

diff --git a/scripts/kconfig/menu.c b/scripts/kconfig/menu.c
index 5a43784..8b772ce 100644
--- a/scripts/kconfig/menu.c
+++ b/scripts/kconfig/menu.c
@@ -127,12 +127,28 @@ void menu_set_type(int type)
 static struct property *menu_add_prop(enum prop_type type, struct expr *expr,
 				      struct expr *dep)
 {
-	struct property *prop = prop_alloc(type, current_entry->sym);
+	struct property *prop;
 
+	prop = xmalloc(sizeof(*prop));
+	memset(prop, 0, sizeof(*prop));
+	prop->type = type;
+	prop->file = current_file;
+	prop->lineno = zconf_lineno();
 	prop->menu = current_entry;
 	prop->expr = expr;
 	prop->visible.expr = dep;
 
+	/* append property to the prop list of symbol */
+	if (current_entry->sym) {
+		struct property **propp;
+
+		for (propp = &current_entry->sym->prop;
+		     *propp;
+		     propp = &(*propp)->next)
+			;
+		*propp = prop;
+	}
+
 	return prop;
 }