Commit e3cd5136 authored Jul 11, 2019 by Masahiro Yamada

kconfig: remove meaningless if-conditional in conf_read()



sym_is_choice(sym) has already been checked by previous if-block:

    if (sym_is_choice(sym) || (sym->flags & SYMBOL_NO_WRITE))
            continue;

Hence, the following code is redundant, and the comment is misleading:

    if (!sym_is_choice(sym))
            continue;
    /* fall through */

It always takes 'continue', never falls though.

Clean up the dead code.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

parent baa23ec8

scripts/kconfig/confdata.c

+2 −4

Original line number	Diff line number	Diff line
		@@ -534,11 +534,9 @@ int conf_read(const char *name)
		switch (sym->type) {
		case S_BOOLEAN:
		case S_TRISTATE:
		if (sym->def[S_DEF_USER].tri != sym_get_tristate_value(sym))
		break;
		if (!sym_is_choice(sym))
		if (sym->def[S_DEF_USER].tri == sym_get_tristate_value(sym))
		continue;
		/* fall through */
		break;
		default:
		if (!strcmp(sym->curr.val, sym->def[S_DEF_USER].val))
		continue;

Admin message