mtd: nand: lpc32xx_mlc: drop custom write_page callback

[Linux-MTD Mailing List]

Gitweb:     http://git.infradead.org/?p=mtd-2.6.git;a=commit;h=5e41d0a7102cfd43a3f0e178d37f2e9654f2fd50
Commit:     5e41d0a7102cfd43a3f0e178d37f2e9654f2fd50
Parent:     0966a416d22bb5d4a5444e5a8eb0e0ae671826e6
Author:     Brian Norris <computersforpeace at gmail.com>
AuthorDate: Mon Dec 16 20:50:32 2013 -0800
Committer:  Brian Norris <computersforpeace at gmail.com>
CommitDate: Fri Jan 3 11:22:26 2014 -0800

    mtd: nand: lpc32xx_mlc: drop custom write_page callback
    
    This driver doesn't need its own custom chip->write_page callback; the
    only "custom" requirement is that this driver does not support subpage
    writes, which we can avoid using the NAND_NO_SUBPAGE_WRITE flag. With
    NAND_NO_SUBPAGE_WRITE, the default routine (nand_write_page()) should
    perform the equivalent operations.
    
    Signed-off-by: Brian Norris <computersforpeace at gmail.com>
    Acked-by: Roland Stigge <stigge at antcom.de>
    Tested-by: Roland Stigge <stigge at antcom.de>
---
 drivers/mtd/nand/lpc32xx_mlc.c | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/drivers/mtd/nand/lpc32xx_mlc.c b/drivers/mtd/nand/lpc32xx_mlc.c
index 327d96c..48be850 100644
--- a/drivers/mtd/nand/lpc32xx_mlc.c
+++ b/drivers/mtd/nand/lpc32xx_mlc.c
@@ -539,20 +539,6 @@ static int lpc32xx_write_page_lowlevel(struct mtd_info *mtd,
 	return 0;
 }
 
-static int lpc32xx_write_page(struct mtd_info *mtd, struct nand_chip *chip,
-			uint32_t offset, int data_len, const uint8_t *buf,
-			int oob_required, int page, int cached, int raw)
-{
-	int res;
-
-	chip->cmdfunc(mtd, NAND_CMD_SEQIN, 0x00, page);
-	res = lpc32xx_write_page_lowlevel(mtd, chip, buf, oob_required);
-	chip->cmdfunc(mtd, NAND_CMD_PAGEPROG, -1, -1);
-	lpc32xx_waitfunc(mtd, chip);
-
-	return res;
-}
-
 static int lpc32xx_read_oob(struct mtd_info *mtd, struct nand_chip *chip,
 			    int page)
 {
@@ -732,9 +718,9 @@ static int lpc32xx_nand_probe(struct platform_device *pdev)
 	nand_chip->ecc.write_oob = lpc32xx_write_oob;
 	nand_chip->ecc.read_oob = lpc32xx_read_oob;
 	nand_chip->ecc.strength = 4;
-	nand_chip->write_page = lpc32xx_write_page;
 	nand_chip->waitfunc = lpc32xx_waitfunc;
 
+	nand_chip->options = NAND_NO_SUBPAGE_WRITE;
 	nand_chip->bbt_options = NAND_BBT_USE_FLASH | NAND_BBT_NO_OOB;
 	nand_chip->bbt_td = &lpc32xx_nand_bbt;
 	nand_chip->bbt_md = &lpc32xx_nand_bbt_mirror;