From ac7977ec8733f77d70b6c39d31995a8b12cae911 Mon Sep 17 00:00:00 2001 From: Naga Sureshkumar Relli Date: Fri, 29 Mar 2019 14:45:14 +0530 Subject: [PATCH] mtd: devices: m25p80: sync driver with mainline v4.19 This patch syncs the driver with mainline 4.19 m25p80.c. Below is the commit from mainline 9882b53 mtd: m25p80: Use SPI_MEM_OP_NO_DUMMY instead of SPI_MEM_OP_DUMMY(0, x) Signed-off-by: Naga Sureshkumar Relli Signed-off-by: Michal Simek --- drivers/mtd/devices/m25p80.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c index 5c65cc0ee136..9f69d18824f9 100644 --- a/drivers/mtd/devices/m25p80.c +++ b/drivers/mtd/devices/m25p80.c @@ -88,7 +88,7 @@ static ssize_t m25p80_write(struct spi_nor *nor, loff_t to, size_t len, struct spi_mem_op op = SPI_MEM_OP(SPI_MEM_OP_CMD(nor->program_opcode, 1), SPI_MEM_OP_ADDR(nor->addr_width, to, 1), - SPI_MEM_OP_DUMMY(0, 1), + SPI_MEM_OP_NO_DUMMY, SPI_MEM_OP_DATA_OUT(len, buf, 1)); size_t remaining = len; int ret; -- 2.39.2