Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
kconfig: remove unused code for S_DEF_AUTO in conf_read_simple()
The 'else' arm here is unreachable in practical use cases.
include/config/auto.conf does not include "# CONFIG_... is not set"
line unless it is manually hacked.
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
+8
-13
+8
-13
scripts/kconfig/confdata.c
+8
-13
scripts/kconfig/confdata.c
···
436
436
*p++ = 0;
437
437
if (strncmp(p, "is not set", 10))
438
438
continue;
439
-
if (def == S_DEF_USER) {
440
-
sym = sym_find(line + 2 + strlen(CONFIG_));
441
-
if (!sym) {
442
-
if (warn_unknown)
443
-
conf_warning("unknown symbol: %s",
444
-
line + 2 + strlen(CONFIG_));
445
439
446
-
conf_set_changed(true);
447
-
continue;
448
-
}
449
-
} else {
450
-
sym = sym_lookup(line + 2 + strlen(CONFIG_), 0);
451
-
if (sym->type == S_UNKNOWN)
452
-
sym->type = S_BOOLEAN;
440
+
sym = sym_find(line + 2 + strlen(CONFIG_));
441
+
if (!sym) {
442
+
if (warn_unknown)
443
+
conf_warning("unknown symbol: %s",
444
+
line + 2 + strlen(CONFIG_));
445
+
446
+
conf_set_changed(true);
447
+
continue;
453
448
}
454
449
if (sym->flags & def_flags) {
455
450
conf_warning("override: reassigning to symbol %s", sym->name);