On Wed, Sep 14, 2022 at 10:52 AM Zeng Heng <zengheng4@xxxxxxxxxx> wrote:
>
> Following Masahiro's suggestion,
> sym_set_choice_value could be removed and directly
> call sym_set_tristate_value instead.
>
> Signed-off-by: Zeng Heng <zengheng4@xxxxxxxxxx>
> Suggested-by: Masahiro Yamada <masahiroy@xxxxxxxxxx>
Applied to linux-kbuild.
Thanks.
> ---
> scripts/kconfig/conf.c | 2 +-
> scripts/kconfig/lkc.h | 5 -----
> 2 files changed, 1 insertion(+), 6 deletions(-)
>
> diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c
> index 4178065ca27f..33d19e419908 100644
> --- 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
> index fa8c010aa683..903738a9233a 100644
> --- a/scripts/kconfig/lkc.h
> +++ b/scripts/kconfig/lkc.h
> @@ -124,11 +124,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;
> --
> 2.25.1
>
--
Best Regards
Masahiro Yamada
