Kconfig: remove sym_set_choice_value

henryZe · masahir0y · commit efc8338e3a72 · 2022-09-29T04:40:15.000+09:00
sym_set_choice_value could be removed and directly call
sym_set_tristate_value instead.

Signed-off-by: Zeng Heng &lt;zengheng4@huawei.com&gt;
Suggested-by: Masahiro Yamada &lt;masahiroy@kernel.org&gt;
Signed-off-by: Masahiro Yamada &lt;masahiroy@kernel.org&gt;
diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c
@@ -551,7 +551,7 @@ static int conf_choice(struct menu *menu)
 			print_help(child);
 			continue;
 		}
-		sym_set_choice_value(sym, child->sym);
+		sym_set_tristate_value(child->sym, yes);
 		for (child = child->list; child; child = child->next) {
 			indent += 2;
 			conf(child);
diff --git a/scripts/kconfig/lkc.h b/scripts/kconfig/lkc.h
@@ -123,11 +123,6 @@ static inline struct symbol *sym_get_choice_value(struct symbol *sym)
 	return (struct symbol *)sym->curr.val;
 }
 
-static inline bool sym_set_choice_value(struct symbol *ch, struct symbol *chval)
-{
-	return sym_set_tristate_value(chval, yes);
-}
-
 static inline bool sym_is_choice(struct symbol *sym)
 {
 	return sym->flags & SYMBOL_CHOICE ? true : false;

Original file line number	Diff line number	Diff line change
`@@ -551,7 +551,7 @@ static int conf_choice(struct menu *menu)`
`551`	`551`	`print_help(child);`
`552`	`552`	`continue;`
`553`	`553`	`}`
`554`		`- sym_set_choice_value(sym, child->sym);`
	`554`	`+ sym_set_tristate_value(child->sym, yes);`
`555`	`555`	`for (child = child->list; child; child = child->next) {`
`556`	`556`	`indent += 2;`
`557`	`557`	`conf(child);`
Original file line number	Diff line number	Diff line change
`@@ -123,11 +123,6 @@ static inline struct symbol sym_get_choice_value(struct symbol sym)`
`123`	`123`	`return (struct symbol *)sym->curr.val;`
`124`	`124`	`}`
`125`	`125`
`126`		`-static inline bool sym_set_choice_value(struct symbol ch, struct symbol chval)`
`127`		`-{`
`128`		`- return sym_set_tristate_value(chval, yes);`
`129`		`-}`
`130`		`-`
`131`	`126`	`static inline bool sym_is_choice(struct symbol *sym)`
`132`	`127`	`{`
`133`	`128`	`return sym->flags & SYMBOL_CHOICE ? true : false;`