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

mtd: rawnand: Pass a nand_chip object to chip->erase() 



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 chip->erase() hook.

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

drivers/mtd/nand/raw/denali.c

+2 −2
Original line number Diff line number Diff line
@@ -915,9 +915,9 @@ static int denali_waitfunc(struct nand_chip *chip) 
	return irq_status & INTR__INT_ACT ? 0 : NAND_STATUS_FAIL;

}



static int denali_erase(struct mtd_info *mtd, int page)

static int denali_erase(struct nand_chip *chip, int page)

{

	struct denali_nand_info *denali = mtd_to_denali(mtd);

	struct denali_nand_info *denali = mtd_to_denali(nand_to_mtd(chip));

	uint32_t irq_status;



	denali_reset_irq(denali);

drivers/mtd/nand/raw/docg4.c

+2 −2
Original line number Diff line number Diff line
@@ -892,9 +892,9 @@ static int docg4_read_oob(struct nand_chip *nand, int page) 
	return 0;

}



static int docg4_erase_block(struct mtd_info *mtd, int page)

static int docg4_erase_block(struct nand_chip *nand, int page)

{

	struct nand_chip *nand = mtd_to_nand(mtd);

	struct mtd_info *mtd = nand_to_mtd(nand);

	struct docg4_priv *doc = nand_get_controller_data(nand);

	void __iomem *docptr = doc->virtadr;

	uint16_t g4_page;

drivers/mtd/nand/raw/nand_base.c

+3 −4
Original line number Diff line number Diff line
@@ -4623,14 +4623,13 @@ out: 


/**

 * single_erase - [GENERIC] NAND standard block erase command function

 * @mtd: MTD device structure

 * @chip: NAND chip object

 * @page: the page address of the block which will be erased

 *

 * Standard erase command for NAND chips. Returns NAND status.

 */

static int single_erase(struct mtd_info *mtd, int page)

static int single_erase(struct nand_chip *chip, int page)

{

	struct nand_chip *chip = mtd_to_nand(mtd);

	unsigned int eraseblock;



	/* Send commands to erase a block */
@@ -4715,7 +4714,7 @@ int nand_erase_nand(struct mtd_info *mtd, struct erase_info *instr, 
		    (page + pages_per_block))

			chip->pagebuf = -1;



		status = chip->erase(mtd, page & chip->pagemask);

		status = chip->erase(chip, page & chip->pagemask);



		/* See if block erase succeeded */

		if (status) {

include/linux/mtd/rawnand.h

+1 −1
Original line number Diff line number Diff line
@@ -1298,7 +1298,7 @@ struct nand_chip { 
	int (*exec_op)(struct nand_chip *chip,

		       const struct nand_operation *op,

		       bool check_only);

	int (*erase)(struct mtd_info *mtd, int page);

	int (*erase)(struct nand_chip *chip, int page);

	int (*set_features)(struct mtd_info *mtd, struct nand_chip *chip,

			    int feature_addr, uint8_t *subfeature_para);

	int (*get_features)(struct mtd_info *mtd, struct nand_chip *chip,

CRA Git | Maintained and supported by SUSTech CRA and CCSE