From 05241aead9b98c28476f74e7e1c5ce480ef40ac1 Mon Sep 17 00:00:00 2001 From: Brian Norris Date: Wed, 5 Nov 2014 02:29:03 -0800 Subject: mtd: spi-nor: factor out write_enable() for erase commands write_enable() was being duplicated to both m25p80.c and fsl-quadspi.c. But this should be handled within the spi-nor abstraction layer. At the same time, let's add write_disable() after erasing, so we don't leave the flash in a write-enabled state afterward. Signed-off-by: Brian Norris Acked-by: Huang Shijie --- drivers/mtd/spi-nor/fsl-quadspi.c | 5 ----- 1 file changed, 5 deletions(-) (limited to 'drivers/mtd/spi-nor/fsl-quadspi.c') diff --git a/drivers/mtd/spi-nor/fsl-quadspi.c b/drivers/mtd/spi-nor/fsl-quadspi.c index 03dcffac8185..7f2ba8d946b5 100644 --- a/drivers/mtd/spi-nor/fsl-quadspi.c +++ b/drivers/mtd/spi-nor/fsl-quadspi.c @@ -738,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); - /* Send write enable, then erase commands. */ - ret = nor->write_reg(nor, SPINOR_OP_WREN, NULL, 0, 0); - if (ret) - return ret; - ret = fsl_qspi_runcmd(q, nor->erase_opcode, offs, 0); if (ret) return ret; -- cgit