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

diff --git a/config/lkc.h b/config/lkc.h
index 4fb16f3166268fd5686b303797561374f58470cf..73d3f01f17363ed7d41052f0a65bdc97e56067f9 100644 (file)
--- a/config/lkc.h
+++ b/config/lkc.h
@@ -112,7 +112,6 @@ struct symbol *sym_choice_default(struct symbol *sym);
 struct property *sym_get_range_prop(struct symbol *sym);
 const char *sym_get_string_default(struct symbol *sym);
 struct symbol *sym_check_deps(struct symbol *sym);
-struct property *prop_alloc(enum prop_type type, struct symbol *sym);
 struct symbol *prop_get_symbol(struct property *prop);
 
 static inline tristate sym_get_tristate_value(struct symbol *sym)

diff --git a/config/menu.c b/config/menu.c
index 5a43784ded2cf80bc4ed3b12bc54c071e0c13a08..8b772ced755dd382cef4b184499627c582aaab21 100644 (file)
--- a/config/menu.c
+++ b/config/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;
 }
 

diff --git a/config/symbol.c b/config/symbol.c
index dbc5365d8bbc545530f561291c1994ff31d6443c..8d38b700b314141671302f828e6b70df4e03aa5d 100644 (file)
--- a/config/symbol.c
+++ b/config/symbol.c
@@ -1273,27 +1273,6 @@ struct symbol *sym_check_deps(struct symbol *sym)
        return sym2;
 }
 
-struct property *prop_alloc(enum prop_type type, struct symbol *sym)
-{
-       struct property *prop;
-       struct property **propp;
-
-       prop = xmalloc(sizeof(*prop));
-       memset(prop, 0, sizeof(*prop));
-       prop->type = type;
-       prop->file = current_file;
-       prop->lineno = zconf_lineno();
-
-       /* append property to the prop list of symbol */
-       if (sym) {
-               for (propp = &sym->prop; *propp; propp = &(*propp)->next)
-                       ;
-               *propp = prop;
-       }
-
-       return prop;
-}
-
 struct symbol *prop_get_symbol(struct property *prop)
 {
        if (prop->expr && (prop->expr->type == E_SYMBOL ||