diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2019-07-11 16:33:17 +0900 |
|---|---|---|
| committer | Masahiro Yamada <yamada.masahiro@socionext.com> | 2019-07-11 23:37:55 +0900 |
| commit | e3cd5136a4ecece6a7599a07add0dfb811a7f49d (patch) | |
| tree | 3893506f241a8fe9c2d3b284f70386d4046ef912 | |
| parent | baa23ec860920ebf3e897c4bbb3420a88ea80ec1 (diff) | |
| download | linux-stable-e3cd5136a4ecece6a7599a07add0dfb811a7f49d.tar.gz linux-stable-e3cd5136a4ecece6a7599a07add0dfb811a7f49d.tar.bz2 linux-stable-e3cd5136a4ecece6a7599a07add0dfb811a7f49d.zip | |
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>
| -rw-r--r-- | scripts/kconfig/confdata.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c index caab7336abc1..501fdcc5e999 100644 --- a/scripts/kconfig/confdata.c +++ b/scripts/kconfig/confdata.c @@ -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; |