A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-30 11:41:38 -04:00
Code Issues Projects Releases Packages Wiki Activity

mtd: m25p80: drop wait-till-ready checks

Browse source 
spi-nor.c should be taking care of these now.

Signed-off-by: Brian Norris <[email protected]>
Reviewed-by: Marek Vasut <[email protected]>
This commit is contained in:
Brian Norris 2014-08-06 18:16:58 -07:00
commit 6af91949ab
2 changed files with 6 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

11
drivers/mtd/devices/m25p80.c
View file

@ -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)