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

kconfig: m/nconf: remove dead code to display children of choice members 



This code previously displayed child symbols of the selected choice
member.

Since commit 7e3465f6 ("kconfig: do not reparent the menu inside
a choice block"), choice members never have child symbols, therefore
this is dead code.

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

scripts/kconfig/mconf.c

+35 −46
Original line number Diff line number Diff line
@@ -551,11 +551,6 @@ static void build_conf(struct menu *menu) 
			if (def_menu) {

				item_add_str(" (%s)", menu_get_prompt(def_menu));

				item_add_str("  --->");

				if (def_menu->list) {

					indent += 2;

					build_conf(def_menu);

					indent -= 2;

				}

			}

			return;

		}
@@ -568,11 +563,6 @@ static void build_conf(struct menu *menu) 
		}

		child_count++;

		val = sym_get_tristate_value(sym);

		if (sym_is_choice_value(sym) && val == yes) {

			item_make("   ");

			item_set_tag(':');

			item_set_data(menu);

		} else {

		switch (type) {

		case S_BOOLEAN:

			if (sym_is_changeable(sym))
@@ -611,7 +601,6 @@ static void build_conf(struct menu *menu) 
			item_set_data(menu);

			goto conf_childs;

		}

		}

		item_add_str("%*c%s%s", indent + 1, ' ', menu_get_prompt(menu),

			  (sym_has_value(sym) || !sym_is_changeable(sym)) ?

			  "" : " (NEW)");

scripts/kconfig/nconf.c

+36 −49
Original line number Diff line number Diff line
@@ -857,11 +857,6 @@ static void build_conf(struct menu *menu) 
				item_add_str(" (%s)",

					menu_get_prompt(def_menu));

				item_add_str("  --->");

				if (def_menu->list) {

					indent += 2;

					build_conf(def_menu);

					indent -= 2;

				}

			}

			return;

		}
@@ -874,9 +869,6 @@ static void build_conf(struct menu *menu) 
		}

		child_count++;

		val = sym_get_tristate_value(sym);

		if (sym_is_choice_value(sym) && val == yes) {

			item_make(menu, ':', "   ");

		} else {

		switch (type) {

		case S_BOOLEAN:

			if (sym_is_changeable(sym))
@@ -900,11 +892,9 @@ static void build_conf(struct menu *menu) 
			}

			if (sym_is_changeable(sym)) {

				if (sym->rev_dep.tri == mod)

						item_make(menu,

							't', "{%c}", ch);

					item_make(menu, 't', "{%c}", ch);

				else

						item_make(menu,

							't', "<%c>", ch);

					item_make(menu, 't', "<%c>", ch);

			} else

				item_make(menu, 't', "-%c-", ch);

			break;
@@ -915,14 +905,11 @@ static void build_conf(struct menu *menu) 
			tmp = indent - tmp + 4;

			if (tmp < 0)

				tmp = 0;

				item_add_str("%*c%s%s", tmp, ' ',

						menu_get_prompt(menu),

			item_add_str("%*c%s%s", tmp, ' ', menu_get_prompt(menu),

				     (sym_has_value(sym) ||

						 !sym_is_changeable(sym)) ? "" :

						" (NEW)");

				      !sym_is_changeable(sym)) ? "" : " (NEW)");

			goto conf_childs;

		}

		}

		item_add_str("%*c%s%s", indent + 1, ' ',

				menu_get_prompt(menu),

				(sym_has_value(sym) || !sym_is_changeable(sym)) ?