Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-15 09:34:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

mtd: nand: Fix build issues due to an anonymous union

Browse Source 
GCC-4.4.4 raises errors when assigning a parameter in an anonymous
union, leading to this kind of failure:

drivers/mtd/nand/marvell_nand.c:1936:
    warning: missing braces around initializer
    warning: (near initialization for '(anonymous)[1].<anonymous>')
    error: unknown field 'data' specified in initializer
    error: unknown field 'addr' specified in initializer

Work around the situation by naming these unions.

Fixes: 8878b126df76 ("mtd: nand: add ->exec_op() implementation")
Reported-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Miquel Raynal <miquel.raynal@free-electrons.com>
Tested-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
This commit is contained in:
Miquel Raynal 2018-01-19 19:11:27 +01:00 committed by Boris Brezillon
parent c495a9275e
commit c1a72e2dbb
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/mtd/nand/nand_base.c
View File

@ -2335,23 +2335,24 @@ nand_op_parser_must_split_instr(const struct nand_op_parser_pattern_elem *pat,
{ {
switch (pat->type) { switch (pat->type) {
case NAND_OP_ADDR_INSTR: case NAND_OP_ADDR_INSTR:
if (!pat->addr.maxcycles) if (!pat->ctx.addr.maxcycles)
break; break;
if (instr->ctx.addr.naddrs - *start_offset > if (instr->ctx.addr.naddrs - *start_offset >
pat->addr.maxcycles) { pat->ctx.addr.maxcycles) {
*start_offset += pat->addr.maxcycles; *start_offset += pat->ctx.addr.maxcycles;
return true; return true;
} }
break; break;
case NAND_OP_DATA_IN_INSTR: case NAND_OP_DATA_IN_INSTR:
case NAND_OP_DATA_OUT_INSTR: case NAND_OP_DATA_OUT_INSTR:
if (!pat->data.maxlen) if (!pat->ctx.data.maxlen)
break; break;
if (instr->ctx.data.len - *start_offset > pat->data.maxlen) { if (instr->ctx.data.len - *start_offset >
*start_offset += pat->data.maxlen; pat->ctx.data.maxlen) {
*start_offset += pat->ctx.data.maxlen;
return true; return true;
} }
break; break;

8
include/linux/mtd/rawnand.h
View File

@ -962,7 +962,7 @@ struct nand_op_parser_pattern_elem {
union { union {
struct nand_op_parser_addr_constraints addr; struct nand_op_parser_addr_constraints addr;
struct nand_op_parser_data_constraints data; struct nand_op_parser_data_constraints data;
}; } ctx;
}; };
#define NAND_OP_PARSER_PAT_CMD_ELEM(_opt) \ #define NAND_OP_PARSER_PAT_CMD_ELEM(_opt) \
@ -975,21 +975,21 @@ struct nand_op_parser_pattern_elem {
{ \ { \
.type = NAND_OP_ADDR_INSTR, \ .type = NAND_OP_ADDR_INSTR, \
.optional = _opt, \ .optional = _opt, \
.addr.maxcycles = _maxcycles, \ .ctx.addr.maxcycles = _maxcycles, \
} }
#define NAND_OP_PARSER_PAT_DATA_IN_ELEM(_opt, _maxlen) \ #define NAND_OP_PARSER_PAT_DATA_IN_ELEM(_opt, _maxlen) \
{ \ { \
.type = NAND_OP_DATA_IN_INSTR, \ .type = NAND_OP_DATA_IN_INSTR, \
.optional = _opt, \ .optional = _opt, \
.data.maxlen = _maxlen, \ .ctx.data.maxlen = _maxlen, \
} }
#define NAND_OP_PARSER_PAT_DATA_OUT_ELEM(_opt, _maxlen) \ #define NAND_OP_PARSER_PAT_DATA_OUT_ELEM(_opt, _maxlen) \
{ \ { \
.type = NAND_OP_DATA_OUT_INSTR, \ .type = NAND_OP_DATA_OUT_INSTR, \
.optional = _opt, \ .optional = _opt, \
.data.maxlen = _maxlen, \ .ctx.data.maxlen = _maxlen, \
} }
#define NAND_OP_PARSER_PAT_WAITRDY_ELEM(_opt) \ #define NAND_OP_PARSER_PAT_WAITRDY_ELEM(_opt) \