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: 172932 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp2169373vqy; Sun, 3 Dec 2023 02:26:39 -0800 (PST) X-Google-Smtp-Source: AGHT+IEQVXROcVwWWmmCbltsIMLdp0mgPQI+HDniyNUkK46A3XE03EZd70gD6IB0ZqOovPSzTQXF X-Received: by 2002:a17:902:b087:b0:1d0:6ffd:9e2c with SMTP id p7-20020a170902b08700b001d06ffd9e2cmr2218782plr.126.1701599199486; Sun, 03 Dec 2023 02:26:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701599199; cv=none; d=google.com; s=arc-20160816; b=TromkCT/Ck3pZAcFGbXi0a/Z+Varauk0RiGW3ngiSkJnGVdhZLi8JH8VAC04Wrm2F8 +2lPCqJRf1ipvO5FluGoPHAeWwUS1vtj3Ip2qd1Vey6icYasT0khSaLOKDhEDjky7UDn DnCi6fna1bbxfialSsg98KUPT7MrLtjprv2tb7F3t/yzAxeHI6zzE0Uxl71iaE3MwaZ7 H+pWjkEhe1juMXgBvSdVPi2ig9tgrTLnzEhUDecMyBaaicHNSWiQ5cMNnGCyqjIy0QoA PIEd9/mOzGuXVdxk/h2sHwHh8PMbellZMFw18OotaxMOixqychjiwOdUX8e5FwcAmvbr RVOw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=cF7qznDyv4bFuGAO5QjteErqkp5DFh1Bul0RFVzttEQ=; fh=cr2kAYujDVm2vUVjNQU/xxltWJfGGL3pZvB2q4ufDBk=; b=QJ9vPrevsbQpKuR53wn0Idf/QcmKiMdbMT+J0Z/d9ixZiHvMSWZYWRS2sGEc1ojZGv vXsGW2zJ1Og9Y/8/a+XiKVCJeK+dy1GDdfbb9Q9JFV4xY8cvmsYx38UrjWqJVFbNLBkm LI4KnHQkVPqxIQ5M/JL48fr2d86zLLq2VTv8ka63y3LN2lnew6kDfPeuVfRlTLGaae8g S9aPivdx35gWuLmTIiPLPoMKym5/hvXm/rvFMGzC50R36U8sk6S/x/FCzqJexonn7f/u i2LbLUSzLKgSvpvNoIJfWcrviBVrHZxC03sNkcNWhu5hSj0VBXLGwPMo346kFSVu034y 2gqQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=IKMP5z88; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from morse.vger.email (morse.vger.email. [2620:137:e000::3:1]) by mx.google.com with ESMTPS id i8-20020a17090ad34800b002869cf21328si527158pjx.158.2023.12.03.02.26.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Dec 2023 02:26:39 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) client-ip=2620:137:e000::3:1; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=IKMP5z88; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by morse.vger.email (Postfix) with ESMTP id 293AF807C7F8; Sun, 3 Dec 2023 02:26:37 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at morse.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233373AbjLCKZd (ORCPT + 99 others); Sun, 3 Dec 2023 05:25:33 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37260 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232339AbjLCKZa (ORCPT ); Sun, 3 Dec 2023 05:25:30 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 00E08FD for ; Sun, 3 Dec 2023 02:25:36 -0800 (PST) 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> MIME-Version: 1.0 X-Spam-Status: No, score=-1.2 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on morse.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (morse.vger.email [0.0.0.0]); Sun, 03 Dec 2023 02:26:37 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784256082282041111 X-GMAIL-MSGID: 1784256082282041111 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)