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 7/8] kconfig: remove sym from struct property
Date: Tue, 17 Dec 2019 13:14:22 +0900 [thread overview]
Message-ID: <20191217041424.29285-8-masahiroy@kernel.org> (raw)
In-Reply-To: <20191217041424.29285-1-masahiroy@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 <masahiroy@kernel.org>
---
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();
--
2.17.1
next prev parent reply other threads:[~2019-12-17 4:15 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 ` [PATCH 1/8] kconfig: remove the rootmenu check in menu_add_prop() Masahiro Yamada
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 ` Masahiro Yamada [this message]
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-8-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