Message ID | 20200720131356.1579073-5-tudor.ambarus@microchip.com |
---|---|
State | Accepted |
Delegated to: | Miquel Raynal |
Headers | show |
Series | [v5,1/6] mtd: rawnand: atmel: Enable the NFC controller at probe time | expand |
On Mon, 2020-07-20 at 13:13:54 UTC, Tudor Ambarus wrote: > From: Boris Brezillon <boris.brezillon@collabora.com> > > The nand_prog_page_end_op() sequence is open-coded in > atmel_hsmc_nand_pmecc_write_pg(). Let's use the generic helper here. > > Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com> > Reviewed-by: Miquel Raynal <miquel.raynal@bootlin.com> > Signed-off-by: Tudor Ambarus <tudor.ambarus@microchip.com> Applied to https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/next, thanks. Miquel
diff --git a/drivers/mtd/nand/raw/atmel/nand-controller.c b/drivers/mtd/nand/raw/atmel/nand-controller.c index a3f901e64bfb..3fe0b3caa5b9 100644 --- a/drivers/mtd/nand/raw/atmel/nand-controller.c +++ b/drivers/mtd/nand/raw/atmel/nand-controller.c @@ -902,7 +902,7 @@ static int atmel_hsmc_nand_pmecc_write_pg(struct nand_chip *chip, struct mtd_info *mtd = nand_to_mtd(chip); struct atmel_nand *nand = to_atmel_nand(chip); struct atmel_hsmc_nand_controller *nc; - int ret, status; + int ret; nc = to_hsmc_nand_controller(chip->controller); @@ -936,19 +936,7 @@ static int atmel_hsmc_nand_pmecc_write_pg(struct nand_chip *chip, nand_write_data_op(chip, chip->oob_poi, mtd->oobsize, false); - nc->op.cmds[0] = NAND_CMD_PAGEPROG; - nc->op.ncmds = 1; - nc->op.cs = nand->activecs->id; - ret = atmel_nfc_exec_op(nc, false); - if (ret) - dev_err(nc->base.dev, "Failed to program NAND page (err = %d)\n", - ret); - - status = chip->legacy.waitfunc(chip); - if (status & NAND_STATUS_FAIL) - return -EIO; - - return ret; + return nand_prog_page_end_op(chip); } static int atmel_hsmc_nand_pmecc_write_page(struct nand_chip *chip,