mtd: m25p80: drop erase() callback
authorBrian Norris <computersforpeace@gmail.com>
Tue, 10 Nov 2015 20:15:28 +0000 (12:15 -0800)
committerBrian Norris <computersforpeace@gmail.com>
Thu, 19 Nov 2015 21:34:45 +0000 (13:34 -0800)
Just use the spi-nor default instead.

Signed-off-by: Brian Norris <computersforpeace@gmail.com>
drivers/mtd/devices/m25p80.c

index f002a8f7537447bc0ec5d3f9e51a1f06acce38bc..6077c4aa898563e2f3a1583fa49e4377a81210d0 100644 (file)
@@ -152,22 +152,6 @@ static int m25p80_read(struct spi_nor *nor, loff_t from, size_t len,
        return 0;
 }
 
-static int m25p80_erase(struct spi_nor *nor, loff_t offset)
-{
-       struct m25p *flash = nor->priv;
-
-       dev_dbg(nor->dev, "%dKiB at 0x%08x\n",
-               flash->spi_nor.mtd.erasesize / 1024, (u32)offset);
-
-       /* Set up command buffer. */
-       flash->command[0] = nor->erase_opcode;
-       m25p_addr2cmd(nor, offset, flash->command);
-
-       spi_write(flash->spi, flash->command, m25p_cmdsz(nor));
-
-       return 0;
-}
-
 /*
  * board specific setup should have ensured the SPI clock used here
  * matches what the READ command supports, at least until this driver
@@ -193,7 +177,6 @@ static int m25p_probe(struct spi_device *spi)
        /* install the hooks */
        nor->read = m25p80_read;
        nor->write = m25p80_write;
-       nor->erase = m25p80_erase;
        nor->write_reg = m25p80_write_reg;
        nor->read_reg = m25p80_read_reg;