mtd: fsl-quadspi: drop wait-till-ready checks
authorBrian Norris <computersforpeace@gmail.com>
Thu, 7 Aug 2014 01:16:59 +0000 (18:16 -0700)
committerBrian Norris <computersforpeace@gmail.com>
Wed, 5 Nov 2014 10:08:21 +0000 (02:08 -0800)
spi-nor.c should be taking care of these now.

Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Cc: Huang Shijie <b32955@freescale.com>
Reviewed-by: Marek Vasut <marex@denx.de>
drivers/mtd/spi-nor/fsl-quadspi.c

index b6aab38c4a975f57880937672e72011851f50fb6..03dcffac81859dad2122c3ecc07578dad981c0fb 100644 (file)
@@ -719,16 +719,10 @@ static int fsl_qspi_read(struct spi_nor *nor, loff_t from,
 {
        struct fsl_qspi *q = nor->priv;
        u8 cmd = nor->read_opcode;
-       int ret;
 
        dev_dbg(q->dev, "cmd [%x],read from (0x%p, 0x%.8x, 0x%.8x),len:%d\n",
                cmd, q->ahb_base, q->chip_base_addr, (unsigned int)from, len);
 
-       /* Wait until the previous command is finished. */
-       ret = nor->wait_till_ready(nor);
-       if (ret)
-               return ret;
-
        /* Read out the data directly from the AHB buffer.*/
        memcpy(buf, q->ahb_base + q->chip_base_addr + from, len);
 
@@ -744,11 +738,6 @@ static int fsl_qspi_erase(struct spi_nor *nor, loff_t offs)
        dev_dbg(nor->dev, "%dKiB at 0x%08x:0x%08x\n",
                nor->mtd->erasesize / 1024, q->chip_base_addr, (u32)offs);
 
-       /* Wait until finished previous write command. */
-       ret = nor->wait_till_ready(nor);
-       if (ret)
-               return ret;
-
        /* Send write enable, then erase commands. */
        ret = nor->write_reg(nor, SPINOR_OP_WREN, NULL, 0, 0);
        if (ret)