* [PATCH 1/3] kconfig: m/nconf: remove dead code to display children of choice members
@ 2024-05-07 10:37 Masahiro Yamada
2024-05-07 10:37 ` [PATCH 2/3] kconfig: m/nconf: remove dead code to display value of bool choice Masahiro Yamada
2024-05-07 10:37 ` [PATCH 3/3] kconfig: m/nconf: merge two item_add_str() calls Masahiro Yamada
0 siblings, 2 replies; 3+ messages in thread
From: Masahiro Yamada @ 2024-05-07 10:37 UTC (permalink / raw)
To: linux-kbuild; +Cc: linux-kernel, Masahiro Yamada
This code previously displayed child symbols of the selected choice
member.
Since commit 7e3465f63a0a ("kconfig: do not reparent the menu inside
a choice block"), choice members never have child symbols, therefore
this is dead code.
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
---
scripts/kconfig/mconf.c | 5 -----
scripts/kconfig/nconf.c | 5 -----
2 files changed, 10 deletions(-)
diff --git a/scripts/kconfig/mconf.c b/scripts/kconfig/mconf.c
index c0969097447d..b33335eba460 100644
--- a/scripts/kconfig/mconf.c
+++ b/scripts/kconfig/mconf.c
@@ -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;
}
diff --git a/scripts/kconfig/nconf.c b/scripts/kconfig/nconf.c
index 9d22b0f3197b..b5b3232f592a 100644
--- a/scripts/kconfig/nconf.c
+++ b/scripts/kconfig/nconf.c
@@ -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;
}
--
2.40.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 2/3] kconfig: m/nconf: remove dead code to display value of bool choice
2024-05-07 10:37 [PATCH 1/3] kconfig: m/nconf: remove dead code to display children of choice members Masahiro Yamada
@ 2024-05-07 10:37 ` Masahiro Yamada
2024-05-07 10:37 ` [PATCH 3/3] kconfig: m/nconf: merge two item_add_str() calls Masahiro Yamada
1 sibling, 0 replies; 3+ messages in thread
From: Masahiro Yamada @ 2024-05-07 10:37 UTC (permalink / raw)
To: linux-kbuild; +Cc: linux-kernel, Masahiro Yamada
Previously, optional bool choices met the following conditions
simultaneously:
- sym_is_choice(sym)
- sym_is_changeable(sym)
- type == S_BOOLEAN
It no longer occurs since 6a1215888e23 ("kconfig: remove 'optional'
property support"). Remove the dead code.
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
---
scripts/kconfig/mconf.c | 17 +++++------------
scripts/kconfig/nconf.c | 26 +++++++++-----------------
2 files changed, 14 insertions(+), 29 deletions(-)
diff --git a/scripts/kconfig/mconf.c b/scripts/kconfig/mconf.c
index b33335eba460..64bf373f7921 100644
--- a/scripts/kconfig/mconf.c
+++ b/scripts/kconfig/mconf.c
@@ -525,19 +525,12 @@ static void build_conf(struct menu *menu)
val = sym_get_tristate_value(sym);
if (sym_is_changeable(sym)) {
- switch (type) {
- case S_BOOLEAN:
- item_make("[%c]", val == no ? ' ' : '*');
- break;
- case S_TRISTATE:
- switch (val) {
- case yes: ch = '*'; break;
- case mod: ch = 'M'; break;
- default: ch = ' '; break;
- }
- item_make("<%c>", ch);
- break;
+ switch (val) {
+ case yes: ch = '*'; break;
+ case mod: ch = 'M'; break;
+ default: ch = ' '; break;
}
+ item_make("<%c>", ch);
item_set_tag('t');
item_set_data(menu);
} else {
diff --git a/scripts/kconfig/nconf.c b/scripts/kconfig/nconf.c
index b5b3232f592a..715e156fdbb1 100644
--- a/scripts/kconfig/nconf.c
+++ b/scripts/kconfig/nconf.c
@@ -826,26 +826,18 @@ static void build_conf(struct menu *menu)
val = sym_get_tristate_value(sym);
if (sym_is_changeable(sym)) {
- switch (type) {
- case S_BOOLEAN:
- item_make(menu, 't', "[%c]",
- val == no ? ' ' : '*');
+ switch (val) {
+ case yes:
+ ch = '*';
break;
- case S_TRISTATE:
- switch (val) {
- case yes:
- ch = '*';
- break;
- case mod:
- ch = 'M';
- break;
- default:
- ch = ' ';
- break;
- }
- item_make(menu, 't', "<%c>", ch);
+ case mod:
+ ch = 'M';
+ break;
+ default:
+ ch = ' ';
break;
}
+ item_make(menu, 't', "<%c>", ch);
} else {
item_make(menu, def_menu ? 't' : ':', " ");
}
--
2.40.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 3/3] kconfig: m/nconf: merge two item_add_str() calls
2024-05-07 10:37 [PATCH 1/3] kconfig: m/nconf: remove dead code to display children of choice members Masahiro Yamada
2024-05-07 10:37 ` [PATCH 2/3] kconfig: m/nconf: remove dead code to display value of bool choice Masahiro Yamada
@ 2024-05-07 10:37 ` Masahiro Yamada
1 sibling, 0 replies; 3+ messages in thread
From: Masahiro Yamada @ 2024-05-07 10:37 UTC (permalink / raw)
To: linux-kbuild; +Cc: linux-kernel, Masahiro Yamada
Just trivial cleanups.
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
---
scripts/kconfig/mconf.c | 6 ++----
scripts/kconfig/nconf.c | 7 ++-----
2 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/scripts/kconfig/mconf.c b/scripts/kconfig/mconf.c
index 64bf373f7921..33929b0b5ca8 100644
--- a/scripts/kconfig/mconf.c
+++ b/scripts/kconfig/mconf.c
@@ -541,10 +541,8 @@ static void build_conf(struct menu *menu)
item_add_str("%*c%s", indent + 1, ' ', menu_get_prompt(menu));
if (val == yes) {
- if (def_menu) {
- item_add_str(" (%s)", menu_get_prompt(def_menu));
- item_add_str(" --->");
- }
+ if (def_menu)
+ item_add_str(" (%s) --->", menu_get_prompt(def_menu));
return;
}
} else {
diff --git a/scripts/kconfig/nconf.c b/scripts/kconfig/nconf.c
index 715e156fdbb1..a9ef2ced7d7a 100644
--- a/scripts/kconfig/nconf.c
+++ b/scripts/kconfig/nconf.c
@@ -845,11 +845,8 @@ static void build_conf(struct menu *menu)
item_add_str("%*c%s", indent + 1,
' ', menu_get_prompt(menu));
if (val == yes) {
- if (def_menu) {
- item_add_str(" (%s)",
- menu_get_prompt(def_menu));
- item_add_str(" --->");
- }
+ if (def_menu)
+ item_add_str(" (%s) --->", menu_get_prompt(def_menu));
return;
}
} else {
--
2.40.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-05-07 10:38 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-05-07 10:37 [PATCH 1/3] kconfig: m/nconf: remove dead code to display children of choice members Masahiro Yamada
2024-05-07 10:37 ` [PATCH 2/3] kconfig: m/nconf: remove dead code to display value of bool choice Masahiro Yamada
2024-05-07 10:37 ` [PATCH 3/3] kconfig: m/nconf: merge two item_add_str() calls Masahiro Yamada
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).