From patchwork Sun Dec 3 10:25:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 13477231 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2A7D779DC for ; Sun, 3 Dec 2023 10:25:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="IKMP5z88" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D3ADEC433D9; Sun, 3 Dec 2023 10:25:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1701599136; bh=xr4qK+/McATkt6q41PjvXqtg2z7HnzV21XZ0nlNgetk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IKMP5z88fzjGpGdCnlKyWmfF+b6BNwd1jdWHy3CARQgDPGEfpSPxyUnfveZzZ5VwM UdNtQweYYnU6E3R/t065Yy5ssR4Tq0SxW6QpO2BrYfCw5wLLESe+zeFWdchcUeuamd B2OL01AOAjKwc0YuwrDp6JoyzwM+V/CxQaWHd/GWLsNILwoWY0B9LWe7Z2GS3DR88V /zg7o0LV9bRcP7TGcbx1Nlgk4jHttWPlPbenCYOgQvxPCvz9/orfaZUdrkfK6jsGjH mgNJolZleOnXZv+ScCdbIdkw5UTpq3eN/ZZ/dgZu7mZXRVYew2EtZ3PjIOvNQhrzFC y81wxIlKhNtsg== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 3/6] kconfig: squash menu_has_help() and menu_get_help() Date: Sun, 3 Dec 2023 19:25:25 +0900 Message-Id: <20231203102528.1913822-3-masahiroy@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231203102528.1913822-1-masahiroy@kernel.org> References: <20231203102528.1913822-1-masahiroy@kernel.org> Precedence: bulk X-Mailing-List: linux-kbuild@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 menu_has_help() and menu_get_help() functions are only used within menu_get_ext_help(). Squash them into menu_get_ext_help(). It revealed the if-conditional in menu_get_help() was unneeded, as menu_has_help() has already checked that menu->help is not NULL. Signed-off-by: Masahiro Yamada --- scripts/kconfig/lkc.h | 2 -- scripts/kconfig/menu.c | 17 ++--------------- 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/scripts/kconfig/lkc.h b/scripts/kconfig/lkc.h index 3908741edf8f..8ca5bbc74df1 100644 --- a/scripts/kconfig/lkc.h +++ b/scripts/kconfig/lkc.h @@ -98,8 +98,6 @@ bool menu_is_visible(struct menu *menu); bool menu_has_prompt(struct menu *menu); const char *menu_get_prompt(struct menu *menu); struct menu *menu_get_parent_menu(struct menu *menu); -bool menu_has_help(struct menu *menu); -const char *menu_get_help(struct menu *menu); int get_jump_key_char(void); struct gstr get_relations_str(struct symbol **sym_arr, struct list_head *head); void menu_get_ext_help(struct menu *menu, struct gstr *help); diff --git a/scripts/kconfig/menu.c b/scripts/kconfig/menu.c index f07c0d8691af..dc60a9ddc5dd 100644 --- a/scripts/kconfig/menu.c +++ b/scripts/kconfig/menu.c @@ -673,19 +673,6 @@ struct menu *menu_get_parent_menu(struct menu *menu) return menu; } -bool menu_has_help(struct menu *menu) -{ - return menu->help != NULL; -} - -const char *menu_get_help(struct menu *menu) -{ - if (menu->help) - return menu->help; - else - return ""; -} - static void get_def_str(struct gstr *r, struct menu *menu) { str_printf(r, "Defined at %s:%d\n", @@ -856,10 +843,10 @@ void menu_get_ext_help(struct menu *menu, struct gstr *help) struct symbol *sym = menu->sym; const char *help_text = nohelp_text; - if (menu_has_help(menu)) { + if (menu->help) { if (sym->name) str_printf(help, "%s%s:\n\n", CONFIG_, sym->name); - help_text = menu_get_help(menu); + help_text = menu->help; } str_printf(help, "%s\n", help_text); if (sym)