aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/kconfig
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2018-11-30 18:15:48 +0900
committerMasahiro Yamada <yamada.masahiro@socionext.com>2018-12-08 10:40:52 +0900
commit75889e9be78febab9991f9c07fdf09d128562bf5 (patch)
tree8213b1bf39312fa5f4cbe7ae37a3371ef190e998 /scripts/kconfig
parentscripts/kconfig/merge_config: don't redefine 'y' to 'm' (diff)
downloadlinux-dev-75889e9be78febab9991f9c07fdf09d128562bf5.tar.xz
linux-dev-75889e9be78febab9991f9c07fdf09d128562bf5.zip
kconfig: remove unneeded setsym label in conf_read_simple()
The two 'goto setsym' statements are reachable only when sym == NULL. The code below the 'setsym:' label does nothing when sym == NULL since there is just one if-block guarded by 'if (sym && ...)'. Hence, 'goto setsym' can be replaced with 'continue'. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Diffstat (limited to 'scripts/kconfig')
-rw-r--r--scripts/kconfig/confdata.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c
index 91d0a5c014ac..1e35529d4eeb 100644
--- a/scripts/kconfig/confdata.c
+++ b/scripts/kconfig/confdata.c
@@ -363,7 +363,7 @@ load:
sym = sym_find(line + 2 + strlen(CONFIG_));
if (!sym) {
sym_add_change_count(1);
- goto setsym;
+ continue;
}
} else {
sym = sym_lookup(line + 2 + strlen(CONFIG_), 0);
@@ -397,7 +397,7 @@ load:
sym = sym_find(line + strlen(CONFIG_));
if (!sym) {
sym_add_change_count(1);
- goto setsym;
+ continue;
}
} else {
sym = sym_lookup(line + strlen(CONFIG_), 0);
@@ -416,7 +416,7 @@ load:
continue;
}
-setsym:
+
if (sym && sym_is_choice_value(sym)) {
struct symbol *cs = prop_get_symbol(sym_get_choice_prop(sym));
switch (sym->def[def].tri) {