linux-next: build failure after merge of the nand tree

From: Stephen Rothwell
Date: Mon Mar 03 2025 - 21:28:37 EST


Hi all,

After merging the nand tree, today's linux-next build (x86_64
allmodconfig) failed like this:

In file included from drivers/mtd/nand/spi/macronix.c:11:
drivers/mtd/nand/spi/macronix.c:190:63: error: expected expression before ',' token
190 | SPINAND_CONT_READ(macronix_set_cont_read),
| ^
include/linux/mtd/spinand.h:541:17: note: in definition of macro 'SPINAND_INFO'
541 | __VA_ARGS__ \
| ^~~~~~~~~~~
drivers/mtd/nand/spi/macronix.c:203:63: error: expected expression before ',' token
203 | SPINAND_CONT_READ(macronix_set_cont_read),
| ^
include/linux/mtd/spinand.h:541:17: note: in definition of macro 'SPINAND_INFO'
541 | __VA_ARGS__ \
| ^~~~~~~~~~~
drivers/mtd/nand/spi/macronix.c:331:63: error: expected expression before ',' token
331 | SPINAND_CONT_READ(macronix_set_cont_read),
| ^
include/linux/mtd/spinand.h:541:17: note: in definition of macro 'SPINAND_INFO'
541 | __VA_ARGS__ \
| ^~~~~~~~~~~
drivers/mtd/nand/spi/macronix.c:381:63: error: expected expression before ',' token
381 | SPINAND_CONT_READ(macronix_set_cont_read),
| ^
include/linux/mtd/spinand.h:541:17: note: in definition of macro 'SPINAND_INFO'
541 | __VA_ARGS__ \
| ^~~~~~~~~~~
drivers/mtd/nand/spi/macronix.c:427:63: error: expected expression before ',' token
427 | SPINAND_CONT_READ(macronix_set_cont_read),
| ^
include/linux/mtd/spinand.h:541:17: note: in definition of macro 'SPINAND_INFO'
541 | __VA_ARGS__ \
| ^~~~~~~~~~~

Caused by commit

da3558d940c6 ("mtd: spi-nand: macronix: Add support for read retry")

The SPINAND_CONT_READ() macro already ends with a ','.

I have used the nand tree from next-20250303 for today.

--
Cheers,
Stephen Rothwell

Attachment: pgptzw9Qn3los.pgp
Description: OpenPGP digital signature