public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Masahiro Yamada <masahiroy@kernel.org>
To: linux-kbuild@vger.kernel.org
Cc: Ulf Magnusson <ulfalizer@gmail.com>,
	Masahiro Yamada <masahiroy@kernel.org>,
	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	[thread overview]
Message-ID: <20191217041424.29285-2-masahiroy@kernel.org> (raw)
In-Reply-To: <20191217041424.29285-1-masahiroy@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 <masahiroy@kernel.org>
---

 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. */
-- 
2.17.1


  reply	other threads:[~2019-12-17  4:14 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-12-17  4:14 [PATCH 0/8] kconfig: misc cleanups Masahiro Yamada
2019-12-17  4:14 ` Masahiro Yamada [this message]
2019-12-17  4:14 ` [PATCH 2/8] kconfig: use parent->dep as the parentdep of 'menu' Masahiro Yamada
2019-12-17  5:55   ` Masahiro Yamada
2019-12-17  4:14 ` [PATCH 3/8] kconfig: drop T_WORD from the RHS of 'prompt' symbol Masahiro Yamada
2019-12-17  4:14 ` [PATCH 4/8] kconfig: remove " Masahiro Yamada
2019-12-17  4:14 ` [PATCH 5/8] kconfig: move prompt handling to menu_add_prompt() from menu_add_prop() Masahiro Yamada
2019-12-17  4:14 ` [PATCH 6/8] kconfig: remove 'prompt' argument " Masahiro Yamada
2019-12-17  4:14 ` [PATCH 7/8] kconfig: remove sym from struct property Masahiro Yamada
2019-12-17  4:14 ` [PATCH 8/8] kconfig: squash prop_alloc() into menu_add_prop() Masahiro Yamada

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20191217041424.29285-2-masahiroy@kernel.org \
    --to=masahiroy@kernel.org \
    --cc=linux-kbuild@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=ulfalizer@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox