[PATCH] mtd: nand: lpc32xx_mlc: drop custom write_page callback

[PATCH] mtd: nand: lpc32xx_mlc: drop custom write_page callback

[Brian Norris]

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.

Compile-tested only.

Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Cc: Roland Stigge <stigge@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 327d96c03505..48be85039a89 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;
-- 
1.8.3.2

Re: [PATCH] mtd: nand: lpc32xx_mlc: drop custom write_page callback

[Roland Stigge]

On 12/17/2013 06:10 AM, Brian Norris wrote:
> 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.
> 
> Compile-tested only.
> 
> Signed-off-by: Brian Norris <computersforpeace@gmail.com>
> Cc: Roland Stigge <stigge@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 327d96c03505..48be85039a89 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;
> 

Thanks!

Acked-by: Roland Stigge <stigge@antcom.de>
Tested-by: Roland Stigge <stigge@antcom.de>

Re: [PATCH] mtd: nand: lpc32xx_mlc: drop custom write_page callback

[Brian Norris]

On Tue, Dec 17, 2013 at 01:30:51PM +0100, Roland Stigge wrote:
> Acked-by: Roland Stigge <stigge@antcom.de>
> Tested-by: Roland Stigge <stigge@antcom.de>

Great, pushed to l2-mtd.git.

Brian