From patchwork Sun Mar 3 04:00:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 209276 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:fa17:b0:10a:f01:a869 with SMTP id ju23csp757851dyc; Sat, 2 Mar 2024 20:01:08 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCV8T80u66BwfLNtkVRgjL8LT7D0V4PPCPbz+NA5RvicavXXanRvGuSx0ve9au5xh4zRMHNs7N7Ys3IsYGw4DW/1eoUzkA== X-Google-Smtp-Source: AGHT+IGcpRYGM0ggmfTukm7pKqsBHmTJbPAkx0kqiM7Rc76Y5FiAWFSlTWr/eq+3wg29zbi8asi+ X-Received: by 2002:a17:903:187:b0:1dc:abe7:a1a6 with SMTP id z7-20020a170903018700b001dcabe7a1a6mr6491926plg.17.1709438468548; Sat, 02 Mar 2024 20:01:08 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1709438468; cv=pass; d=google.com; s=arc-20160816; b=tyKI5M2n71VcaVc5ypUU0IdXEhbM7Io5IENGsN5l4B/RegAZnr465FQtpJNaApymIh bnI3gkh9eK08cYLQrnc0t5X3l4PtykQ7GFMbNa7BNZaq5RkpBGDNLejsmuPjn4Jlb1Am wivrpwO7cGf/GA+OC4cX4gfITJfygErejgWpJO1xMfOP6hfcwdFXQty4f9QTBEdGbOPe ZD7TJ82WIaziNTec3EgLYsPy9rkbU5lowYGpR8jKc8MYj25Ts+fW1pMUFm/a3+sxr1A6 Wx9Xro2KGJ0AJqbHlYj2Sq1vNHTbJrNMZDuz7woqIEV8YQoENM+ou1d0XZd6DX91AyZT HFzQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=IQEr3SL+XevAoOOk/ARLWph+tBP8TFNlpPLwubvoeuk=; fh=oQbvuNnOUeIuBT5siQdg+euUHNNdn+CeEwAg69/1RSo=; b=Nhi81Uw20YRPwEH0/CHJzPbMOdUyoRTrbRrLuGIyBUwmBeAbVKeD6eAacipEgHNcTj zMiQjkxnLS1jlVEZ/W5xvJZhvckBql4XMwQKWdXLFnTys/LImCmuoUnsLKZY5c6oFuYX 7CfADu460u7rYWHgw8Uxos4cHXtmyt5/FvII2neznjCzs9JOfxLx8NTsh9Af5efznpK7 +PRhpfkfw4hIZp7ltrKT0MCUe4H/E76rSaXyQqY+AunjwTtgrf9schDo4DeNd0DquTSI 8mWPbP1vyeve122FAPJtf+T4iD563oEICBX9c9aA3L0FYGUBF2bmIySHcRyjzRPMxImN Hh6A==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=dh6b+igi; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-89648-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-89648-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id k11-20020a170902c40b00b001dca88c3811si6480223plk.606.2024.03.02.20.01.08 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 Mar 2024 20:01:08 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-89648-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=dh6b+igi; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-89648-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-89648-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 5BB06283F1F for ; Sun, 3 Mar 2024 04:01:08 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 8DDAAA953; Sun, 3 Mar 2024 04:00:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="dh6b+igi" 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 0776E6FD0; Sun, 3 Mar 2024 04:00:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709438442; cv=none; b=G5lT7wY7OCdqo0pBWopFqqtoSTbqmhL814HSfsbI3gmnBs0kDbvhP9o1bDNw09b4lD0M32pS/b4tUsvjShFkFYNB7Q9cQfQuQ9YS8jaajO2y1Hg/KPtrv4jPFdb5cmPAvcx9gqUNpxPHWEtitBkTZR6QlV3aAuURnlfvyaog+kU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709438442; c=relaxed/simple; bh=lXxv7xJWAlJqvQFRnp9M3lrdj0gJLvlnbtl717FZbxs=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Ws9+yfcHdEN4gCl8QSiONwaqWLZaqzmzeOGoPMn4sXBMxB3idnBnIVQRqVqReSIPWwFiAqtqxTiPSTSHFLMM1MTZm0r4926hIjLdDs6yxYGxpJwrnXLA392enZbrZ7MPqp/FIriIwB6JB/2JMQxdNaooZXr2ufVplylzsUfDdlo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=dh6b+igi; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 95DA0C43390; Sun, 3 Mar 2024 04:00:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1709438441; bh=lXxv7xJWAlJqvQFRnp9M3lrdj0gJLvlnbtl717FZbxs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dh6b+igiB4aTOI/O9SivESZbD0SWWk1mtZ1L2TB6N2TI3XDc4hANH0sF17JsujD1E ZtIeIHk2Xf7zSdIMu2BJwVgLXoFn9XrrykXk7Tt4PNGUqvW1Xngj7AvPnuQ+3EJ60S +CbH1k11Sr2fWB8GQHaNHGN+UVbbMeShUlD3aXsSn1gZbhxQ+kCqhhbVnx4VgVYvGe GlhxWnr1pKQLxu4iil7fr146GTyHRviQPtRmuRzafuE0alNRjIQLtW/UnM/E2KSG+i vtMmttld9BZBSouwO9Pf/zx/JP4XK1JG2g/iMLNIJ4VF/Pzc2c1TNv2WxLNg8lLVrX NPp/uMJwCrkEg== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Masahiro Yamada Subject: [PATCH 2/3] kconfig: use linked list in get_symbol_str() to iterate over menus Date: Sun, 3 Mar 2024 13:00:34 +0900 Message-Id: <20240303040035.3450914-2-masahiroy@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20240303040035.3450914-1-masahiroy@kernel.org> References: <20240303040035.3450914-1-masahiroy@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1792476151283490342 X-GMAIL-MSGID: 1792476151283490342 Currently, get_symbol_str() uses a tricky approach to traverse the associated menus. With relevant menus now linked to the symbol using a linked list, use list_for_each_entry() for iterating on the menus. Signed-off-by: Masahiro Yamada Reviewed-by: Nicolas Schier --- scripts/kconfig/menu.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/scripts/kconfig/menu.c b/scripts/kconfig/menu.c index 571394ed71e0..840ce642ec43 100644 --- a/scripts/kconfig/menu.c +++ b/scripts/kconfig/menu.c @@ -771,6 +771,7 @@ static void get_symbol_str(struct gstr *r, struct symbol *sym, struct list_head *head) { struct property *prop; + struct menu *menu; if (sym && sym->name) { str_printf(r, "Symbol: %s [=%s]\n", sym->name, @@ -787,17 +788,17 @@ static void get_symbol_str(struct gstr *r, struct symbol *sym, } /* Print the definitions with prompts before the ones without */ - for_all_properties(sym, prop, P_SYMBOL) { - if (prop->menu->prompt) { - get_def_str(r, prop->menu); - get_prompt_str(r, prop->menu->prompt, head); + list_for_each_entry(menu, &sym->menus, link) { + if (menu->prompt) { + get_def_str(r, menu); + get_prompt_str(r, menu->prompt, head); } } - for_all_properties(sym, prop, P_SYMBOL) { - if (!prop->menu->prompt) { - get_def_str(r, prop->menu); - get_dep_str(r, prop->menu->dep, " Depends on: "); + list_for_each_entry(menu, &sym->menus, link) { + if (!menu->prompt) { + get_def_str(r, menu); + get_dep_str(r, menu->dep, " Depends on: "); } }