From patchwork Tue Dec 17 04:14:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 11296517 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id AF5EA138C for ; Tue, 17 Dec 2019 04:14:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8DCDB2176D for ; Tue, 17 Dec 2019 04:14:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576556091; bh=4x2GUG1QxWu9upeaTQESXjLmLdg8/EPGtwxfYqsnrQ4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=yb7YRgXNyYBR87GQ5AZhaKrrHx13b7ox8TH8oNjKPjufmJneg8RbhYgR0zQy6gkfP 0BYYk4pAmZ8DrazGmhUDut5ybWC7yYnEtY/bzDkPSWtBTb07tV+L8LzNGT02TYyG9o quDjtYc1l2pJAS1UTWcUjTWKkejMXii8Hm/E4ln0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727197AbfLQEOo (ORCPT ); Mon, 16 Dec 2019 23:14:44 -0500 Received: from conuserg-12.nifty.com ([210.131.2.79]:49223 "EHLO conuserg-12.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725836AbfLQEOo (ORCPT ); Mon, 16 Dec 2019 23:14:44 -0500 Received: from localhost.localdomain (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-12.nifty.com with ESMTP id xBH4EPAB024524; Tue, 17 Dec 2019 13:14:26 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-12.nifty.com xBH4EPAB024524 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1576556067; bh=j6pJQEI+9SUQgaZj03Qn5Zj+CocBybtzStd3IOhT2/k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TH7cDtp6PHazyZ1a9gTMUxBi3lB/HCyHQZ8wUbiUFvMfukSGWLNYAV+fGOApU+gBe kSZXh7n0xIOBa913XnJK6S1TRdEsN5AFnGl5Ex+0+3/d2q9V90EBoHaEHOdOde8vZy y8VGuiXuEHY5YWAAHlm8DD4n7t4K7w6st2C+R/yErwOui37g4+p8WnbGv6hVE3I03w GrmR8oZO3wwuU79rgPlLaiyyiWw1h7d71+hPTiYhKP+TG/7H7sOgf/K+pvZ2cUwFrW kvH5z+k8pSj3i2AgP6SlyvIWIvSwNTo/2A+hg2LqoniPamlphhnnbILINGHAlprK/t KY+YFC5FpsOeg== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Ulf Magnusson , Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 1/8] kconfig: remove the rootmenu check in menu_add_prop() Date: Tue, 17 Dec 2019 13:14:16 +0900 Message-Id: <20191217041424.29285-2-masahiroy@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191217041424.29285-1-masahiroy@kernel.org> References: <20191217041424.29285-1-masahiroy@kernel.org> Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org This reverts commit ba6ff60d5eb4 ("kconfig: don't emit warning upon rootmenu's prompt redefinition"). At that time, rootmenu.prompt was always set first, then it was set again if a "mainmenu" statement was specified in the Kconfig file. This is no longer the case since commit 0724a7c32a54 ("kconfig: Don't leak main menus during parsing"). Remove the unneeded check. Signed-off-by: Masahiro Yamada --- scripts/kconfig/menu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/kconfig/menu.c b/scripts/kconfig/menu.c index d9d16469859a..b1b1ee8cf987 100644 --- a/scripts/kconfig/menu.c +++ b/scripts/kconfig/menu.c @@ -138,7 +138,7 @@ static struct property *menu_add_prop(enum prop_type type, char *prompt, struct while (isspace(*prompt)) prompt++; } - if (current_entry->prompt && current_entry != &rootmenu) + if (current_entry->prompt) prop_warn(prop, "prompt redefined"); /* Apply all upper menus' visibilities to actual prompts. */ From patchwork Tue Dec 17 04:14:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 11296513 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 70611138C for ; Tue, 17 Dec 2019 04:14:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4E1192176D for ; Tue, 17 Dec 2019 04:14:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576556084; bh=xXnA/lHHiCJV7DGw9UzJDey2YGRAyarwW3/3K3QAnPI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=orEB6f+mzGTby8Ix6xqHJcco4jdHmyKYTHo9iHqKFLFDDh5U1/aK4luZqWkO9Zjhg bfdZOttosrc0tu1MuQa+RQMNFnEcYvdl3qDdKjc+3WOi1w2yrYLsEutec1K3f2I5AD aTZlnND0OUZ5jiPyIcdxrtdi9bsk5WzeQFPNkdPo= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727494AbfLQEOo (ORCPT ); Mon, 16 Dec 2019 23:14:44 -0500 Received: from conuserg-12.nifty.com ([210.131.2.79]:49221 "EHLO conuserg-12.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727197AbfLQEOn (ORCPT ); Mon, 16 Dec 2019 23:14:43 -0500 Received: from localhost.localdomain (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-12.nifty.com with ESMTP id xBH4EPAC024524; Tue, 17 Dec 2019 13:14:27 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-12.nifty.com xBH4EPAC024524 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1576556067; bh=foPF+zAHGQEanKdZGF+9RSpEod3LbyDsyqscpmeIdk0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=D1PvA19yrPQGbDl0vAXkYNDEZFLDq2H3A1PSxvI6/ZZGGxD8fCrAAh2nSehnYh2z0 4etxh7AGL7OEibGjo9aJqTgKkHypdtBkq+u/f0Y2HshigwB3UQwSHe5vSI/a6to7ey ECTf+RI6OBYLvFglRPFGag7PKaPddf/U1YbWhBQ2ThKdNaMT5E0C7BtLroYgUMABe3 Q7vHVQdYqEo5z1iY0uDlDLIo/Q7J1nRsAzxo5aGOmL3/pOSngpX8pkxsKhy+bv2pFY OfeSj0VFKS7OJbeOzT8uOdzcjT0w6XtA5qCKor3FvN6OQWTp713qFvMdE75hK2Hfwn Te3TQcQSkiKRA== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Ulf Magnusson , Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 2/8] kconfig: use parent->dep as the parentdep of 'menu' Date: Tue, 17 Dec 2019 13:14:17 +0900 Message-Id: <20191217041424.29285-3-masahiroy@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191217041424.29285-1-masahiroy@kernel.org> References: <20191217041424.29285-1-masahiroy@kernel.org> Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org In menu_finalize(), the dependency of a menu entry is propagated downwards. For the 'menu', ->dep and ->prompt->visible.expr are the same. Both accumulate the 'depends on' of itself and upper menu entries. Signed-off-by: Masahiro Yamada --- scripts/kconfig/menu.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/scripts/kconfig/menu.c b/scripts/kconfig/menu.c index b1b1ee8cf987..bbabf0a59ac4 100644 --- a/scripts/kconfig/menu.c +++ b/scripts/kconfig/menu.c @@ -326,12 +326,10 @@ void menu_finalize(struct menu *parent) * choice value symbols. */ parentdep = expr_alloc_symbol(sym); - } else if (parent->prompt) - /* Menu node for 'menu' */ - parentdep = parent->prompt->visible.expr; - else - /* Menu node for 'if' */ + } else { + /* Menu node for 'menu', 'if' */ parentdep = parent->dep; + } /* For each child menu node... */ for (menu = parent->list; menu; menu = menu->next) { From patchwork Tue Dec 17 04:14:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 11296527 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0453A17F0 for ; Tue, 17 Dec 2019 04:15:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CCF232465E for ; Tue, 17 Dec 2019 04:15:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576556111; bh=gixdtZYQbYephnc08CdCIjqGTf2Z8q/HgtYJ8MHYVts=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=gulZASx42LPGsobNWR1CmyO0ux6TU/gtbHvTb247w1QPHIJRu45Z3x+oi2nCLlUfz vHtXUaPTaBZM06tSw9tkL7C1PE7mJOOLbrbJ1+TcCv4OlGZu7gfAnkNKV53i/KQPWf m2YUQzmLUNsJm5vRtL5Ksl5tItYFSlRJyU8qCMnQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726767AbfLQEPE (ORCPT ); Mon, 16 Dec 2019 23:15:04 -0500 Received: from conuserg-12.nifty.com ([210.131.2.79]:49413 "EHLO conuserg-12.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727680AbfLQEOv (ORCPT ); Mon, 16 Dec 2019 23:14:51 -0500 Received: from localhost.localdomain (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-12.nifty.com with ESMTP id xBH4EPAD024524; Tue, 17 Dec 2019 13:14:28 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-12.nifty.com xBH4EPAD024524 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1576556068; bh=+kyEsSfRk7GZ3DX/TzRbKlttag60tm9I4S84+8zbCx4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=B8/BMaAZF29OOEhNNdaOjKpveXoD5EoyJM+CzsYHyOoYmlhoC6UdcPMeJ+1w3cDwo JjzR1NijZBBFs8L1nq9jqrAeP/PFqtuyHAaWKij+Z/agoA6U60NYkEkeYKgrvrpuWP wxxjzxJpNzgXRp1cUuA7L0SLCWxk1hDDhZZnAwTfHErNTplVYvFvOa2c9qqNKrx5PR 81shUntBrtoJdJZEdQ8OP42JN0AD6X54MMxKtFQRfcKcM92xUMlWsnrx3RUZkuVe5G lJ/yzeOx3HbcLLV431gT0JHX+ifAk4xEqVLVr8+KkpB9GV9vmrPSYTQ5myFwNF4214 wmSVHHnuYdIkg== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Ulf Magnusson , Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 3/8] kconfig: drop T_WORD from the RHS of 'prompt' symbol Date: Tue, 17 Dec 2019 13:14:18 +0900 Message-Id: <20191217041424.29285-4-masahiroy@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191217041424.29285-1-masahiroy@kernel.org> References: <20191217041424.29285-1-masahiroy@kernel.org> Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org Commit 8636a1f9677d ("treewide: surround Kconfig file paths with double quotes") killed use-cases to reduce an unquoted string into the 'prompt' symbol. Kconfig still allows to use an unquoted string in the context of menu, source, or prompt. So, you can omit quoting if the prompt is a single word: bool foo ..., but I do not think this is so useful. Let's require quoting: bool "foo" All the Kconfig files in the kernel are written in this way. Signed-off-by: Masahiro Yamada --- scripts/kconfig/parser.y | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/scripts/kconfig/parser.y b/scripts/kconfig/parser.y index 86e75ea74731..80585f04f590 100644 --- a/scripts/kconfig/parser.y +++ b/scripts/kconfig/parser.y @@ -445,9 +445,7 @@ prompt_stmt_opt: menu_add_prompt(P_PROMPT, $1, $2); }; -prompt: T_WORD - | T_WORD_QUOTE -; +prompt: T_WORD_QUOTE end: T_ENDMENU T_EOL { $$ = "menu"; } | T_ENDCHOICE T_EOL { $$ = "choice"; current_choice_menu = NULL; } From patchwork Tue Dec 17 04:14:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 11296521 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 95EB717F0 for ; Tue, 17 Dec 2019 04:15:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 72DFA2467E for ; Tue, 17 Dec 2019 04:15:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576556103; bh=9bevpXRJo8YKeMzq83BvUn+kDrNbs/iGWmKyRFqTmig=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=DmHhjpaw2EmnGD7L+43BM/A27vng7vb/WIiZFHQhVSauyz/83NA5gJ7G9VC5liUvI bj5f/R0UNJKFPEJCqhC19BFjgpyxLKnw27O8eg+nDAQ1JTNdMuJDA+r/ju+vT7qsxd Eo+vB3GYYeNF9EvBZOIu9sjuJf1Npb1U52E7HV/A= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727774AbfLQEO5 (ORCPT ); Mon, 16 Dec 2019 23:14:57 -0500 Received: from conuserg-12.nifty.com ([210.131.2.79]:49419 "EHLO conuserg-12.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727687AbfLQEOw (ORCPT ); Mon, 16 Dec 2019 23:14:52 -0500 Received: from localhost.localdomain (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-12.nifty.com with ESMTP id xBH4EPAE024524; Tue, 17 Dec 2019 13:14:28 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-12.nifty.com xBH4EPAE024524 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1576556068; bh=An5jhCMPBE3WXglnz3cPdiHBZ9YvliinUc141cReA9Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LIwEzAcDb9tAP/VfggJbke3KYC4/YcOSFeZ/GKCrvmffj+LyH+EaV7PIgAU1v5MB7 cNfNIqGJQoeRbT8/fFAQTIa0TVonMmumZlhsbch304tUGLleN2aEuIGeRN6Ki3KOjD NTfqbXXrPenilsFd+x9WBO5DW8HcV+tb3018Lad80hUfnKasMO431JJdHitZ0dDHrY mM26zSIjzsDSrdMJ5tAMTcm3I81LRnZ7pLysrjRAqELdKKb6tB8zfUrbrABie48mvu 03A7IO7Tg+DRPK7t3n1Dx2l91vXrGfOTi8p4G69Q9xR5iu53+HjS6o0FOWEyEydPw3 Xjt2/3cvQoSMw== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Ulf Magnusson , Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 4/8] kconfig: remove 'prompt' symbol Date: Tue, 17 Dec 2019 13:14:19 +0900 Message-Id: <20191217041424.29285-5-masahiroy@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191217041424.29285-1-masahiroy@kernel.org> References: <20191217041424.29285-1-masahiroy@kernel.org> Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org Now that 'prompt' is only reduced from T_WORD_QUOTE without any action, use T_WORD_QUOTE directly. Signed-off-by: Masahiro Yamada --- scripts/kconfig/parser.y | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/scripts/kconfig/parser.y b/scripts/kconfig/parser.y index 80585f04f590..40e46996e6a5 100644 --- a/scripts/kconfig/parser.y +++ b/scripts/kconfig/parser.y @@ -93,7 +93,6 @@ static struct menu *current_choice_menu; %left T_LESS T_LESS_EQUAL T_GREATER T_GREATER_EQUAL %nonassoc T_NOT -%type prompt %type nonconst_symbol %type symbol %type type logic_type default @@ -116,7 +115,7 @@ input: mainmenu_stmt stmt_list | stmt_list; /* mainmenu entry */ -mainmenu_stmt: T_MAINMENU prompt T_EOL +mainmenu_stmt: T_MAINMENU T_WORD_QUOTE T_EOL { menu_add_prompt(P_MENU, $2, NULL); }; @@ -184,7 +183,7 @@ config_option: type prompt_stmt_opt T_EOL $1); }; -config_option: T_PROMPT prompt if_expr T_EOL +config_option: T_PROMPT T_WORD_QUOTE if_expr T_EOL { menu_add_prompt(P_PROMPT, $2, $3); printd(DEBUG_PARSE, "%s:%d:prompt\n", zconf_curname(), zconf_lineno()); @@ -276,7 +275,7 @@ choice_option_list: | choice_option_list help ; -choice_option: T_PROMPT prompt if_expr T_EOL +choice_option: T_PROMPT T_WORD_QUOTE if_expr T_EOL { menu_add_prompt(P_PROMPT, $2, $3); printd(DEBUG_PARSE, "%s:%d:prompt\n", zconf_curname(), zconf_lineno()); @@ -345,7 +344,7 @@ if_stmt: if_entry stmt_list if_end /* menu entry */ -menu: T_MENU prompt T_EOL +menu: T_MENU T_WORD_QUOTE T_EOL { menu_add_entry(NULL); menu_add_prompt(P_MENU, $2, NULL); @@ -374,7 +373,7 @@ menu_option_list: | menu_option_list depends ; -source_stmt: T_SOURCE prompt T_EOL +source_stmt: T_SOURCE T_WORD_QUOTE T_EOL { printd(DEBUG_PARSE, "%s:%d:source %s\n", zconf_curname(), zconf_lineno(), $2); zconf_nextfile($2); @@ -383,7 +382,7 @@ source_stmt: T_SOURCE prompt T_EOL /* comment entry */ -comment: T_COMMENT prompt T_EOL +comment: T_COMMENT T_WORD_QUOTE T_EOL { menu_add_entry(NULL); menu_add_prompt(P_COMMENT, $2, NULL); @@ -440,13 +439,11 @@ visible: T_VISIBLE if_expr T_EOL prompt_stmt_opt: /* empty */ - | prompt if_expr + | T_WORD_QUOTE if_expr { menu_add_prompt(P_PROMPT, $1, $2); }; -prompt: T_WORD_QUOTE - end: T_ENDMENU T_EOL { $$ = "menu"; } | T_ENDCHOICE T_EOL { $$ = "choice"; current_choice_menu = NULL; } | T_ENDIF T_EOL { $$ = "if"; } From patchwork Tue Dec 17 04:14:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 11296519 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 44F99138C for ; Tue, 17 Dec 2019 04:14:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 22029206E6 for ; Tue, 17 Dec 2019 04:14:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576556097; bh=cOk6IIlH6PebtbSxCJ8oriLNKUaqEMp/IBEKTp999QU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Un80303aTP0zWnopxp4JIAIaj/i4GdNSXmBy2C8bW+9/adxg1udhgxji58lsGfIdF QDoNhMnIxgH7Bu9uQWRbwaIjJ5akZQVCEE3sfW6IcFZM+4YFqvauY/j8eX2lkHxD5o fWZ2OYw+l2LXranA6tIR/TlqFjx4scdijGpX5rNA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727324AbfLQEOw (ORCPT ); Mon, 16 Dec 2019 23:14:52 -0500 Received: from conuserg-12.nifty.com ([210.131.2.79]:49416 "EHLO conuserg-12.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727683AbfLQEOw (ORCPT ); Mon, 16 Dec 2019 23:14:52 -0500 Received: from localhost.localdomain (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-12.nifty.com with ESMTP id xBH4EPAF024524; Tue, 17 Dec 2019 13:14:29 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-12.nifty.com xBH4EPAF024524 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1576556069; bh=zTfsz4q4N5zqvuqTxH8EVK2Vwep22Qgk0oB4uevhHXM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LdvTRScsLP6hfOvy61kc3+9uLpg3c0hbsdIBe+3gew4wfgJvCrAljsUdiU8TyQDUt SC82+xqVm9kmodzGUADghrVn8JNR3MwJd1go3b9kv1Vs1WhFlhXAwrzITP/W2SqYGd Bhzm4TOM39+pcdSPF5+vxXtgxNHuN0SQ63SBfvDwjQFo+Slo82viULRbp4lx4S2K+G O175ZhHxQVfGAXg1IqvWv/Ac6L9mmLjb71WtEdzcHC5/13PVbjdmZebUatBuunXpv5 ILJrfBAR616w0Rc+ZZ/8pWb9TJ6G53AqUVdzUR1BlEWMhOnREk3jq+XOtQ8fMp6YyA CpG90L5J8s2eA== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Ulf Magnusson , Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 5/8] kconfig: move prompt handling to menu_add_prompt() from menu_add_prop() Date: Tue, 17 Dec 2019 13:14:20 +0900 Message-Id: <20191217041424.29285-6-masahiroy@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191217041424.29285-1-masahiroy@kernel.org> References: <20191217041424.29285-1-masahiroy@kernel.org> Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org menu_add_prompt() is the only function that calls menu_add_prop() with non-NULL prompt. So, the code inside the if-conditional block of menu_add_prop() can be moved to menu_add_prompt(). Signed-off-by: Masahiro Yamada --- scripts/kconfig/menu.c | 70 ++++++++++++++++++++---------------------- 1 file changed, 34 insertions(+), 36 deletions(-) diff --git a/scripts/kconfig/menu.c b/scripts/kconfig/menu.c index bbabf0a59ac4..45daece8d983 100644 --- a/scripts/kconfig/menu.c +++ b/scripts/kconfig/menu.c @@ -132,53 +132,51 @@ static struct property *menu_add_prop(enum prop_type type, char *prompt, struct prop->expr = expr; prop->visible.expr = dep; - if (prompt) { - if (isspace(*prompt)) { - prop_warn(prop, "leading whitespace ignored"); - while (isspace(*prompt)) - prompt++; - } - if (current_entry->prompt) - prop_warn(prop, "prompt redefined"); + return prop; +} - /* Apply all upper menus' visibilities to actual prompts. */ - if(type == P_PROMPT) { - struct menu *menu = current_entry; +struct property *menu_add_prompt(enum prop_type type, char *prompt, + struct expr *dep) +{ + struct property *prop = menu_add_prop(type, prompt, NULL, dep); - while ((menu = menu->parent) != NULL) { - struct expr *dup_expr; + if (isspace(*prompt)) { + prop_warn(prop, "leading whitespace ignored"); + while (isspace(*prompt)) + prompt++; + } + if (current_entry->prompt) + prop_warn(prop, "prompt redefined"); - if (!menu->visibility) - continue; - /* - * Do not add a reference to the - * menu's visibility expression but - * use a copy of it. Otherwise the - * expression reduction functions - * will modify expressions that have - * multiple references which can - * cause unwanted side effects. - */ - dup_expr = expr_copy(menu->visibility); + /* Apply all upper menus' visibilities to actual prompts. */ + if (type == P_PROMPT) { + struct menu *menu = current_entry; - prop->visible.expr - = expr_alloc_and(prop->visible.expr, - dup_expr); - } - } + while ((menu = menu->parent) != NULL) { + struct expr *dup_expr; - current_entry->prompt = prop; + if (!menu->visibility) + continue; + /* + * Do not add a reference to the menu's visibility + * expression but use a copy of it. Otherwise the + * expression reduction functions will modify + * expressions that have multiple references which + * can cause unwanted side effects. + */ + dup_expr = expr_copy(menu->visibility); + + prop->visible.expr = expr_alloc_and(prop->visible.expr, + dup_expr); + } } + + current_entry->prompt = prop; prop->text = prompt; return prop; } -struct property *menu_add_prompt(enum prop_type type, char *prompt, struct expr *dep) -{ - return menu_add_prop(type, prompt, NULL, dep); -} - void menu_add_visibility(struct expr *expr) { current_entry->visibility = expr_alloc_and(current_entry->visibility, From patchwork Tue Dec 17 04:14:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 11296525 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B71AB1593 for ; Tue, 17 Dec 2019 04:15:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9453D2465E for ; Tue, 17 Dec 2019 04:15:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576556111; bh=+bciv4t+EaSawuvHVnQbZKdPHcQgST5UEQByuL+mqHM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=wfg4j+PM9HDoRTeh/rTH0OL6H0ePG/I4PmKB7rCEsTzIgSN9fHLqowMGmXIOeZIZr woWEnrJfQsrg0OlVDc/IsTE/XRJPyV2mOxvuDTw8oIG6ktnoMKpddw2argj3ffVcBG ICMoxaGeBUq3f7oggUcqoMXqq7/cyTDl+Juj7qiU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727687AbfLQEPE (ORCPT ); Mon, 16 Dec 2019 23:15:04 -0500 Received: from conuserg-12.nifty.com ([210.131.2.79]:49412 "EHLO conuserg-12.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727672AbfLQEOv (ORCPT ); Mon, 16 Dec 2019 23:14:51 -0500 Received: from localhost.localdomain (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-12.nifty.com with ESMTP id xBH4EPAG024524; Tue, 17 Dec 2019 13:14:29 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-12.nifty.com xBH4EPAG024524 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1576556069; bh=I67uXDjGaUh0GQqIQ3B+sRnn8ctM5KQ8N6d9zWDGUEI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ng8QnyW7WTYrO6sR793fOPukcs1rsjmxFxBXAJO+khfo6lZ1BNyBPo7nTCPR2eL+x bxrCL/Y1gWpcnXWKyJ39btUSgB8mEc28tL8lvHFCiKlk/fyEp1VnH65jtLS8ueHVZH MCPxRp16B7cVHdxNZOVorQ18cUOaj4cnIYwwgNOb4d4hR4i2l3S0U7KOCh6P2l51j4 chD2pWt/nS1L3IcJTWMdLxsKhmJjnS79J8vszZPMAq9g6137d3OswZxJ400LHqkeld 9PSuqO8fBtRerqHTAfoyZQKz1A7/LBk+1aMUpo2RLbKdysbgFuzEaNC5YRkbMnWQzw jdkXzXIUng/Bg== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Ulf Magnusson , Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 6/8] kconfig: remove 'prompt' argument from menu_add_prop() Date: Tue, 17 Dec 2019 13:14:21 +0900 Message-Id: <20191217041424.29285-7-masahiroy@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191217041424.29285-1-masahiroy@kernel.org> References: <20191217041424.29285-1-masahiroy@kernel.org> Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org This function does not use the 'prompt' argument. Signed-off-by: Masahiro Yamada --- scripts/kconfig/menu.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/scripts/kconfig/menu.c b/scripts/kconfig/menu.c index 45daece8d983..5a43784ded2c 100644 --- a/scripts/kconfig/menu.c +++ b/scripts/kconfig/menu.c @@ -124,7 +124,8 @@ void menu_set_type(int type) sym_type_name(sym->type), sym_type_name(type)); } -static struct property *menu_add_prop(enum prop_type type, char *prompt, struct expr *expr, struct expr *dep) +static struct property *menu_add_prop(enum prop_type type, struct expr *expr, + struct expr *dep) { struct property *prop = prop_alloc(type, current_entry->sym); @@ -138,7 +139,7 @@ static struct property *menu_add_prop(enum prop_type type, char *prompt, struct struct property *menu_add_prompt(enum prop_type type, char *prompt, struct expr *dep) { - struct property *prop = menu_add_prop(type, prompt, NULL, dep); + struct property *prop = menu_add_prop(type, NULL, dep); if (isspace(*prompt)) { prop_warn(prop, "leading whitespace ignored"); @@ -185,12 +186,12 @@ void menu_add_visibility(struct expr *expr) void menu_add_expr(enum prop_type type, struct expr *expr, struct expr *dep) { - menu_add_prop(type, NULL, expr, dep); + menu_add_prop(type, expr, dep); } void menu_add_symbol(enum prop_type type, struct symbol *sym, struct expr *dep) { - menu_add_prop(type, NULL, expr_alloc_symbol(sym), dep); + menu_add_prop(type, expr_alloc_symbol(sym), dep); } void menu_add_option_modules(void) From patchwork Tue Dec 17 04:14:22 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 11296523 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 05A1F109A for ; Tue, 17 Dec 2019 04:15:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CD4432467E for ; Tue, 17 Dec 2019 04:15:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576556103; bh=nHBZARSCljW8/8hjS8btsfR0kX5K0JKPnXWrNmqybTM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=hn0uqbOpu9dQ0KLxEZYiSHwLp4ojWd+tVBgrxpUilO/hKmrVFc2F6j8xieAJISi68 8Gsm1XWQCV8aFIa+qRxJGlMvQUglSv31wfuEe5QS/TvNk8dXPxTMbL5HsybXWvHB4+ bGUCYE3dNhbUE3DGOnV/Wns026vsRqikko8PjhJU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727683AbfLQEO5 (ORCPT ); Mon, 16 Dec 2019 23:14:57 -0500 Received: from conuserg-12.nifty.com ([210.131.2.79]:49418 "EHLO conuserg-12.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727684AbfLQEOw (ORCPT ); Mon, 16 Dec 2019 23:14:52 -0500 Received: from localhost.localdomain (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-12.nifty.com with ESMTP id xBH4EPAH024524; Tue, 17 Dec 2019 13:14:30 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-12.nifty.com xBH4EPAH024524 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1576556071; bh=a17nZoX2gmVNQ4RyqbzSYYjo3e0s9uhnamYb1ruGEGA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1LiE6IMaPP9ehZN+dvlxyyzzzJmXkTuhpeWon0y25ZSwbnNsqbneQRAE0XVEzQ8s7 RmoUTBQou3XprADyX27eyReBJaF9Yoma+Sv8y429iOz/XsuNdaEZ+wsVp3kApgcCgO m/YPQSX/BB1ILaoaua57eca0GlZHtO8OuH6at2GMNrkKRmLAOIJ71c+4XgnjqLFQWI HI+JahCUfcHFwd2QDclWkpQdc+gOSJLNHzCoL//NGZXcLWrCIVfR0J4g1ogBRjaI75 2IHa403kHzvsgoQ7cpJA9jLZYgJjmY1WTeUhDXyGRfcIq0WOtwUEGtuw5wrXe8kzLi am8EiHbpkDV5g== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Ulf Magnusson , Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 7/8] kconfig: remove sym from struct property Date: Tue, 17 Dec 2019 13:14:22 +0900 Message-Id: <20191217041424.29285-8-masahiroy@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191217041424.29285-1-masahiroy@kernel.org> References: <20191217041424.29285-1-masahiroy@kernel.org> Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org struct property can reference to the symbol that it is associated with by prop->menu->sym. Fix up the one usage of prop->sym, and remove sym from struct property. Signed-off-by: Masahiro Yamada --- scripts/kconfig/expr.h | 1 - scripts/kconfig/parser.y | 2 +- scripts/kconfig/symbol.c | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/scripts/kconfig/expr.h b/scripts/kconfig/expr.h index 017843c9a4f4..6e102a3b8bd5 100644 --- a/scripts/kconfig/expr.h +++ b/scripts/kconfig/expr.h @@ -191,7 +191,6 @@ enum prop_type { struct property { struct property *next; /* next property - null if last */ - struct symbol *sym; /* the symbol for which the property is associated */ enum prop_type type; /* type of property */ const char *text; /* the prompt value - P_PROMPT, P_MENU, P_COMMENT */ struct expr_value visible; diff --git a/scripts/kconfig/parser.y b/scripts/kconfig/parser.y index 40e46996e6a5..d5c41a5c370c 100644 --- a/scripts/kconfig/parser.y +++ b/scripts/kconfig/parser.y @@ -671,7 +671,7 @@ static void print_symbol(FILE *out, struct menu *menu) break; case P_SYMBOL: fputs( " symbol ", out); - fprintf(out, "%s\n", prop->sym->name); + fprintf(out, "%s\n", prop->menu->sym->name); break; default: fprintf(out, " unknown prop %d!\n", prop->type); diff --git a/scripts/kconfig/symbol.c b/scripts/kconfig/symbol.c index f56eec5ea4c7..dbc5365d8bbc 100644 --- a/scripts/kconfig/symbol.c +++ b/scripts/kconfig/symbol.c @@ -1281,7 +1281,6 @@ struct property *prop_alloc(enum prop_type type, struct symbol *sym) prop = xmalloc(sizeof(*prop)); memset(prop, 0, sizeof(*prop)); prop->type = type; - prop->sym = sym; prop->file = current_file; prop->lineno = zconf_lineno(); From patchwork Tue Dec 17 04:14:23 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 11296529 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2EF94109A for ; Tue, 17 Dec 2019 04:15:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0D2A02176D for ; Tue, 17 Dec 2019 04:15:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576556112; bh=gL+n45Y8J7nZzArPZtwslrhpL2MpoxSfqyZuKjhFUYw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Csz7c/mefiwrGf9iEKKrZ4m+LRcTmUmQiUSfRq+Qx+Xk/knJ4qsUlMTcoa4boQIbo Y5pwIkgyORZoiCZAnzQXeSmf3j/lDs3/oNU9owuhRiY69OeZJMVTXCECJaU6KdiS4p lCKfkAS466nzsrtuIDA+ncYqt5NmxrvcSbJZbRRE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727690AbfLQEOv (ORCPT ); Mon, 16 Dec 2019 23:14:51 -0500 Received: from conuserg-12.nifty.com ([210.131.2.79]:49410 "EHLO conuserg-12.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727472AbfLQEOv (ORCPT ); Mon, 16 Dec 2019 23:14:51 -0500 Received: from localhost.localdomain (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-12.nifty.com with ESMTP id xBH4EPAI024524; Tue, 17 Dec 2019 13:14:31 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-12.nifty.com xBH4EPAI024524 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1576556071; bh=2R2qiN5dNPqF6NEga1JY7x7NqLiqE7O4OMCOP5WmCd4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dYqTKlChd96JXA4L9b0zfGNe66UAWKUC8O+AYVgsbNpLG0SYAn8s9jlITw/mx5zxo 2/J3hrzpjxOqFoQMMs/C2XAu1cTmFr9NyleQa0PB6VNIXP4Kiv6z30U2YTG8OemIyy dFlCUHruAEpPeudnqhQHxR4fUMg0hZCxtkB88ljeOK0G12c1HAcujvb21y9Kv6OOm+ yAKDg+Btv+0/EAAkTn+TpAB1zfSjcVkIOsLFh5ZeKik8v5sS6u9YPOwRvR1tEq58LM 1NfIi7OLHpXcjAIUi4z7pzlQTDtzjA8duB3dpM/fBx3vasv+qLzUrAlL0hXQu+86MB /NBePIEylyIgw== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Ulf Magnusson , Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 8/8] kconfig: squash prop_alloc() into menu_add_prop() Date: Tue, 17 Dec 2019 13:14:23 +0900 Message-Id: <20191217041424.29285-9-masahiroy@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191217041424.29285-1-masahiroy@kernel.org> References: <20191217041424.29285-1-masahiroy@kernel.org> Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org prop_alloc() is only called from menu_add_prop(). Squash it. Signed-off-by: Masahiro Yamada --- scripts/kconfig/lkc.h | 1 - scripts/kconfig/menu.c | 18 +++++++++++++++++- scripts/kconfig/symbol.c | 21 --------------------- 3 files changed, 17 insertions(+), 23 deletions(-) diff --git a/scripts/kconfig/lkc.h b/scripts/kconfig/lkc.h index 4fb16f316626..73d3f01f1736 100644 --- a/scripts/kconfig/lkc.h +++ b/scripts/kconfig/lkc.h @@ -112,7 +112,6 @@ struct symbol *sym_choice_default(struct symbol *sym); struct property *sym_get_range_prop(struct symbol *sym); const char *sym_get_string_default(struct symbol *sym); struct symbol *sym_check_deps(struct symbol *sym); -struct property *prop_alloc(enum prop_type type, struct symbol *sym); struct symbol *prop_get_symbol(struct property *prop); static inline tristate sym_get_tristate_value(struct symbol *sym) diff --git a/scripts/kconfig/menu.c b/scripts/kconfig/menu.c index 5a43784ded2c..8b772ced755d 100644 --- a/scripts/kconfig/menu.c +++ b/scripts/kconfig/menu.c @@ -127,12 +127,28 @@ void menu_set_type(int type) static struct property *menu_add_prop(enum prop_type type, struct expr *expr, struct expr *dep) { - struct property *prop = prop_alloc(type, current_entry->sym); + struct property *prop; + prop = xmalloc(sizeof(*prop)); + memset(prop, 0, sizeof(*prop)); + prop->type = type; + prop->file = current_file; + prop->lineno = zconf_lineno(); prop->menu = current_entry; prop->expr = expr; prop->visible.expr = dep; + /* append property to the prop list of symbol */ + if (current_entry->sym) { + struct property **propp; + + for (propp = ¤t_entry->sym->prop; + *propp; + propp = &(*propp)->next) + ; + *propp = prop; + } + return prop; } diff --git a/scripts/kconfig/symbol.c b/scripts/kconfig/symbol.c index dbc5365d8bbc..8d38b700b314 100644 --- a/scripts/kconfig/symbol.c +++ b/scripts/kconfig/symbol.c @@ -1273,27 +1273,6 @@ struct symbol *sym_check_deps(struct symbol *sym) return sym2; } -struct property *prop_alloc(enum prop_type type, struct symbol *sym) -{ - struct property *prop; - struct property **propp; - - prop = xmalloc(sizeof(*prop)); - memset(prop, 0, sizeof(*prop)); - prop->type = type; - prop->file = current_file; - prop->lineno = zconf_lineno(); - - /* append property to the prop list of symbol */ - if (sym) { - for (propp = &sym->prop; *propp; propp = &(*propp)->next) - ; - *propp = prop; - } - - return prop; -} - struct symbol *prop_get_symbol(struct property *prop) { if (prop->expr && (prop->expr->type == E_SYMBOL ||