summaryrefslogtreecommitdiff
path: root/drivers/mtd/devices/m25p80.c
diff options
context:
space:
mode:
authorBrian Norris <computersforpeace@gmail.com>2014-08-07 05:16:58 +0400
committerBrian Norris <computersforpeace@gmail.com>2014-11-05 13:08:20 +0300
commit6af91949ab7462d0917f436820c263ae9a89322c (patch)
tree2ab56ef66ad4ee6c997f3ac8fb1ca51160231cc3 /drivers/mtd/devices/m25p80.c
parentdfa9c0cba4ea20e766bbb4f89152b05d00ab9ab3 (diff)
downloadlinux-6af91949ab7462d0917f436820c263ae9a89322c.tar.xz
mtd: m25p80: drop wait-till-ready checks
spi-nor.c should be taking care of these now. Signed-off-by: Brian Norris <computersforpeace@gmail.com> Reviewed-by: Marek Vasut <marex@denx.de>
Diffstat (limited to 'drivers/mtd/devices/m25p80.c')
-rw-r--r--drivers/mtd/devices/m25p80.c11
1 files changed, 0 insertions, 11 deletions
diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c
index 5d4482512e36..35e7e9896b17 100644
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
@@ -129,16 +129,10 @@ static int m25p80_read(struct spi_nor *nor, loff_t from, size_t len,
struct spi_transfer t[2];
struct spi_message m;
unsigned int dummy = nor->read_dummy;
- int ret;
/* convert the dummy cycles to the number of bytes */
dummy /= 8;
- /* Wait till previous write/erase is done. */
- ret = nor->wait_till_ready(nor);
- if (ret)
- return ret;
-
spi_message_init(&m);
memset(t, 0, (sizeof t));
@@ -168,11 +162,6 @@ static int m25p80_erase(struct spi_nor *nor, loff_t offset)
dev_dbg(nor->dev, "%dKiB at 0x%08x\n",
flash->mtd.erasesize / 1024, (u32)offset);
- /* 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)