]> rtime.felk.cvut.cz Git - zynq/linux.git/commitdiff
mtd: devices: m25p80: sync driver with mainline v4.19
authorNaga Sureshkumar Relli <naga.sureshkumar.relli@xilinx.com>
Fri, 29 Mar 2019 09:15:14 +0000 (14:45 +0530)
committerMichal Simek <michal.simek@xilinx.com>
Fri, 29 Mar 2019 10:16:08 +0000 (11:16 +0100)
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 <naga.sureshkumar.relli@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
drivers/mtd/devices/m25p80.c

index 5c65cc0ee136166b30deef093a0f434981510e51..9f69d18824f90a16b6e78e8298c69753411ea914 100644 (file)
@@ -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;