Commit e4cdf9cb authored by Boris Brezillon's avatar Boris Brezillon Committed by Miquel Raynal
Browse files

mtd: rawnand: Pass a nand_chip object nand_erase_nand() 



Let's make the raw NAND API consistent by patching all helpers and
hooks to take a nand_chip object instead of an mtd_info one or
remove the mtd_info object when both are passed.

Let's tackle the nand_erase_nand() helper.

Signed-off-by: default avatarBoris Brezillon <boris.brezillon@bootlin.com>
Signed-off-by: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
parent 5740d4c4

drivers/mtd/nand/raw/nand_base.c

+5 −5
Original line number Diff line number Diff line
@@ -505,7 +505,7 @@ static int nand_block_markbad_lowlevel(struct mtd_info *mtd, loff_t ofs) 
		memset(&einfo, 0, sizeof(einfo));

		einfo.addr = ofs;

		einfo.len = 1ULL << chip->phys_erase_shift;

		nand_erase_nand(mtd, &einfo, 0);

		nand_erase_nand(chip, &einfo, 0);



		/* Write bad block marker to OOB */

		nand_get_device(mtd, FL_WRITING);
@@ -4638,22 +4638,22 @@ static int single_erase(struct nand_chip *chip, int page) 
 */

static int nand_erase(struct mtd_info *mtd, struct erase_info *instr)

{

	return nand_erase_nand(mtd, instr, 0);

	return nand_erase_nand(mtd_to_nand(mtd), instr, 0);

}



/**

 * nand_erase_nand - [INTERN] erase block(s)

 * @mtd: MTD device structure

 * @chip: NAND chip object

 * @instr: erase instruction

 * @allowbbt: allow erasing the bbt area

 *

 * Erase one ore more blocks.

 */

int nand_erase_nand(struct mtd_info *mtd, struct erase_info *instr,

int nand_erase_nand(struct nand_chip *chip, struct erase_info *instr,

		    int allowbbt)

{

	struct mtd_info *mtd = nand_to_mtd(chip);

	int page, status, pages_per_block, ret, chipnr;

	struct nand_chip *chip = mtd_to_nand(mtd);

	loff_t len;



	pr_debug("%s: start = 0x%012llx, len = %llu\n",

drivers/mtd/nand/raw/nand_bbt.c

+1 −1
Original line number Diff line number Diff line
@@ -853,7 +853,7 @@ static int write_bbt(struct mtd_info *mtd, uint8_t *buf, 
		memset(&einfo, 0, sizeof(einfo));

		einfo.addr = to;

		einfo.len = 1 << this->bbt_erase_shift;

		res = nand_erase_nand(mtd, &einfo, 1);

		res = nand_erase_nand(this, &einfo, 1);

		if (res < 0) {

			pr_warn("nand_bbt: error while erasing BBT block %d\n",

				res);

include/linux/mtd/rawnand.h

+1 −1
Original line number Diff line number Diff line
@@ -1548,7 +1548,7 @@ int nand_create_bbt(struct nand_chip *chip); 
int nand_markbad_bbt(struct nand_chip *chip, loff_t offs);

int nand_isreserved_bbt(struct nand_chip *chip, loff_t offs);

int nand_isbad_bbt(struct nand_chip *chip, loff_t offs, int allowbbt);

int nand_erase_nand(struct mtd_info *mtd, struct erase_info *instr,

int nand_erase_nand(struct nand_chip *chip, struct erase_info *instr,

		    int allowbbt);



/**

CRA Git | Maintained and supported by SUSTech CRA and CCSE