Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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@gmail.com>
Acked-by: Roland Stigge <stigge@antcom.de>
Tested-by: Roland Stigge <stigge@antcom.de>

+1 -15
+1 -15
drivers/mtd/nand/lpc32xx_mlc.c
··· 539 539 return 0; 540 540 } 541 541 542 - static int lpc32xx_write_page(struct mtd_info *mtd, struct nand_chip *chip, 543 - uint32_t offset, int data_len, const uint8_t *buf, 544 - int oob_required, int page, int cached, int raw) 545 - { 546 - int res; 547 - 548 - chip->cmdfunc(mtd, NAND_CMD_SEQIN, 0x00, page); 549 - res = lpc32xx_write_page_lowlevel(mtd, chip, buf, oob_required); 550 - chip->cmdfunc(mtd, NAND_CMD_PAGEPROG, -1, -1); 551 - lpc32xx_waitfunc(mtd, chip); 552 - 553 - return res; 554 - } 555 - 556 542 static int lpc32xx_read_oob(struct mtd_info *mtd, struct nand_chip *chip, 557 543 int page) 558 544 { ··· 718 732 nand_chip->ecc.write_oob = lpc32xx_write_oob; 719 733 nand_chip->ecc.read_oob = lpc32xx_read_oob; 720 734 nand_chip->ecc.strength = 4; 721 - nand_chip->write_page = lpc32xx_write_page; 722 735 nand_chip->waitfunc = lpc32xx_waitfunc; 723 736 737 + nand_chip->options = NAND_NO_SUBPAGE_WRITE; 724 738 nand_chip->bbt_options = NAND_BBT_USE_FLASH | NAND_BBT_NO_OOB; 725 739 nand_chip->bbt_td = &lpc32xx_nand_bbt; 726 740 nand_chip->bbt_md = &lpc32xx_nand_bbt_mirror;