Commit adf7c5bd authored by Masahiro Yamada's avatar Masahiro Yamada
Browse files

kconfig: squash prop_alloc() into menu_add_prop() 



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

Signed-off-by: default avatarMasahiro Yamada <masahiroy@kernel.org>
parent 6397d96b

scripts/kconfig/lkc.h

+0 −1
Original line number Diff line number Diff line
@@ -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)

scripts/kconfig/menu.c

+17 −1
Original line number Diff line number Diff line
@@ -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;

}

scripts/kconfig/symbol.c

+0 −21
Original line number Diff line number Diff line
@@ -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 ||