android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kconfig: squash prop_alloc() into menu_add_prop()

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

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
This commit is contained in:
Masahiro Yamada 2019-12-17 13:14:23 +09:00
parent 6397d96ba5
commit adf7c5bd06
3 changed files with 17 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
scripts/kconfig/lkc.h
View File

@ -112,7 +112,6 @@ struct symbol *sym_choice_default(struct symbol *sym);
struct property *sym_get_range_prop(struct symbol *sym); struct property *sym_get_range_prop(struct symbol *sym);
const char *sym_get_string_default(struct symbol *sym); const char *sym_get_string_default(struct symbol *sym);
struct symbol *sym_check_deps(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); struct symbol *prop_get_symbol(struct property *prop);
static inline tristate sym_get_tristate_value(struct symbol *sym) static inline tristate sym_get_tristate_value(struct symbol *sym)

18
scripts/kconfig/menu.c
View File

@ -127,12 +127,28 @@ void menu_set_type(int type)
static struct property *menu_add_prop(enum prop_type type, struct expr *expr, static struct property *menu_add_prop(enum prop_type type, struct expr *expr,
struct expr *dep) 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->menu = current_entry;
prop->expr = expr; prop->expr = expr;
prop->visible.expr = dep; 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; return prop;
} }

21
scripts/kconfig/symbol.c
View File

@ -1273,27 +1273,6 @@ struct symbol *sym_check_deps(struct symbol *sym)
return sym2; 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) struct symbol *prop_get_symbol(struct property *prop)
{ {
if (prop->expr && (prop->expr->type == E_SYMBOL || if (prop->expr && (prop->expr->type == E_SYMBOL ||