nand_oob_16/64 are names already used in the core and it is very misleading to reuse them here for something that is Zynq specific. It works because the core structures are not exported, but it is bad practice, so rename them to prefix them "zynq_" instead.
Signed-off-by: Miquel Raynal (DAVE) <[email protected]> --- drivers/mtd/nand/raw/zynq_nand.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/mtd/nand/raw/zynq_nand.c b/drivers/mtd/nand/raw/zynq_nand.c index ca1aff25a522..05b500d09613 100644 --- a/drivers/mtd/nand/raw/zynq_nand.c +++ b/drivers/mtd/nand/raw/zynq_nand.c @@ -185,7 +185,7 @@ static const struct zynq_nand_command_format zynq_nand_commands[] = { }; /* Define default oob placement schemes for large and small page devices */ -static struct nand_ecclayout nand_oob_16 = { +static struct nand_ecclayout zynq_oob_16 = { .eccbytes = 3, .eccpos = {0, 1, 2}, .oobfree = { @@ -193,7 +193,7 @@ static struct nand_ecclayout nand_oob_16 = { } }; -static struct nand_ecclayout nand_oob_64 = { +static struct nand_ecclayout zynq_oob_64 = { .eccbytes = 12, .eccpos = { 52, 53, 54, 55, 56, 57, @@ -1258,9 +1258,9 @@ static int zynq_nand_probe(struct udevice *dev) } if (mtd->oobsize == 16) - nand_chip->ecc.layout = &nand_oob_16; + nand_chip->ecc.layout = &zynq_oob_16; else if (mtd->oobsize == 64) - nand_chip->ecc.layout = &nand_oob_64; + nand_chip->ecc.layout = &zynq_oob_64; else printf("%s: No oob layout found\n", __func__); } -- 2.53.0
