From: Masahiro Yamada <yamada.masahiro@socionext.com>
To: linux-mtd@lists.infradead.org,
Boris Brezillon <boris.brezillon@bootlin.com>,
Miquel Raynal <miquel.raynal@bootlin.com>
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>,
Brian Norris <computersforpeace@gmail.com>,
linux-kernel@vger.kernel.org, Marek Vasut <marek.vasut@gmail.com>,
Richard Weinberger <richard@nod.at>,
David Woodhouse <dwmw2@infradead.org>,
Boris Brezillon <bbrezillon@kernel.org>
Subject: [PATCH 2/2] mtd: rawnand: use unnamed union in struct nand_op_parser_pattern_elem
Date: Tue, 22 Jan 2019 16:42:55 +0900 [thread overview]
Message-ID: <1548142975-14219-3-git-send-email-yamada.masahiro@socionext.com> (raw)
In-Reply-To: <1548142975-14219-1-git-send-email-yamada.masahiro@socionext.com>
Although drivers do not directly get access to the private data of
instruction patterns, let's use unnamed union field to be consistent
with nand_op_instr.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---
drivers/mtd/nand/raw/nand_base.c | 12 ++++++------
include/linux/mtd/rawnand.h | 8 ++++----
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/drivers/mtd/nand/raw/nand_base.c b/drivers/mtd/nand/raw/nand_base.c
index 3b620cd..d29de69 100644
--- a/drivers/mtd/nand/raw/nand_base.c
+++ b/drivers/mtd/nand/raw/nand_base.c
@@ -1995,24 +1995,24 @@ nand_op_parser_must_split_instr(const struct nand_op_parser_pattern_elem *pat,
{
switch (pat->type) {
case NAND_OP_ADDR_INSTR:
- if (!pat->ctx.addr.maxcycles)
+ if (!pat->addr.maxcycles)
break;
if (instr->addr.naddrs - *start_offset >
- pat->ctx.addr.maxcycles) {
- *start_offset += pat->ctx.addr.maxcycles;
+ pat->addr.maxcycles) {
+ *start_offset += pat->addr.maxcycles;
return true;
}
break;
case NAND_OP_DATA_IN_INSTR:
case NAND_OP_DATA_OUT_INSTR:
- if (!pat->ctx.data.maxlen)
+ if (!pat->data.maxlen)
break;
if (instr->data.len - *start_offset >
- pat->ctx.data.maxlen) {
- *start_offset += pat->ctx.data.maxlen;
+ pat->data.maxlen) {
+ *start_offset += pat->data.maxlen;
return true;
}
break;
diff --git a/include/linux/mtd/rawnand.h b/include/linux/mtd/rawnand.h
index b606ed3..7abb605 100644
--- a/include/linux/mtd/rawnand.h
+++ b/include/linux/mtd/rawnand.h
@@ -741,7 +741,7 @@ struct nand_op_parser_pattern_elem {
union {
struct nand_op_parser_addr_constraints addr;
struct nand_op_parser_data_constraints data;
- } ctx;
+ };
};
#define NAND_OP_PARSER_PAT_CMD_ELEM(_opt) \
@@ -754,21 +754,21 @@ struct nand_op_parser_pattern_elem {
{ \
.type = NAND_OP_ADDR_INSTR, \
.optional = _opt, \
- .ctx.addr.maxcycles = _maxcycles, \
+ .addr.maxcycles = _maxcycles, \
}
#define NAND_OP_PARSER_PAT_DATA_IN_ELEM(_opt, _maxlen) \
{ \
.type = NAND_OP_DATA_IN_INSTR, \
.optional = _opt, \
- .ctx.data.maxlen = _maxlen, \
+ .data.maxlen = _maxlen, \
}
#define NAND_OP_PARSER_PAT_DATA_OUT_ELEM(_opt, _maxlen) \
{ \
.type = NAND_OP_DATA_OUT_INSTR, \
.optional = _opt, \
- .ctx.data.maxlen = _maxlen, \
+ .data.maxlen = _maxlen, \
}
#define NAND_OP_PARSER_PAT_WAITRDY_ELEM(_opt) \
--
2.7.4
next prev parent reply other threads:[~2019-01-22 7:44 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-22 7:42 [PATCH 0/2] mtd: nand: use unnamed union field Masahiro Yamada
2019-01-22 7:42 ` [PATCH 1/2] mtd: rawnand: use unnamed union in struct nand_op_instr Masahiro Yamada
2019-01-22 7:42 ` Masahiro Yamada [this message]
2019-01-22 7:49 ` [PATCH 2/2] mtd: rawnand: use unnamed union in struct nand_op_parser_pattern_elem Miquel Raynal
2019-01-22 8:00 ` Masahiro Yamada
2019-01-22 8:08 ` Miquel Raynal
2019-01-22 8:33 ` Boris Brezillon
2019-01-22 8:55 ` 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=1548142975-14219-3-git-send-email-yamada.masahiro@socionext.com \
--to=yamada.masahiro@socionext.com \
--cc=bbrezillon@kernel.org \
--cc=boris.brezillon@bootlin.com \
--cc=computersforpeace@gmail.com \
--cc=dwmw2@infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mtd@lists.infradead.org \
--cc=marek.vasut@gmail.com \
--cc=miquel.raynal@bootlin.com \
--cc=richard@nod.at \
/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;
as well as URLs for NNTP newsgroup(s).