Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7d135bcc authored by Boris Brezillon's avatar Boris Brezillon
Browse files

mtd: nand: Drop the ->errstat() hook 



The ->errstat() hook is no longer implemented NAND controller drivers.
Get rid of it before someone starts abusing it.

Signed-off-by: default avatarBoris Brezillon <boris.brezillon@free-electrons.com>
parent 0b4773fd

drivers/mtd/nand/nand_base.c

+0 −16
Original line number Diff line number Diff line
@@ -2753,14 +2753,6 @@ static int nand_write_page(struct mtd_info *mtd, struct nand_chip *chip, 
	if (nand_standard_page_accessors(&chip->ecc))

		chip->cmdfunc(mtd, NAND_CMD_PAGEPROG, -1, -1);

	status = chip->waitfunc(mtd, chip);

	/*

	 * See if operation failed and additional status checks are

	 * available.

	 */

	if ((status & NAND_STATUS_FAIL) && (chip->errstat))

		status = chip->errstat(mtd, chip, FL_WRITING, status,

				       page);



	if (status & NAND_STATUS_FAIL)

		return -EIO;
@@ -3220,14 +3212,6 @@ int nand_erase_nand(struct mtd_info *mtd, struct erase_info *instr, 


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



		/*

		 * See if operation failed and additional status checks are

		 * available

		 */

		if ((status & NAND_STATUS_FAIL) && (chip->errstat))

			status = chip->errstat(mtd, chip, FL_ERASING,

					       status, page);



		/* See if block erase succeeded */

		if (status & NAND_STATUS_FAIL) {

			pr_debug("%s: failed erase, page 0x%08x\n",

include/linux/mtd/nand.h

+0 −5
Original line number Diff line number Diff line
@@ -834,9 +834,6 @@ struct nand_manufacturer_ops { 
 *			structure which is shared among multiple independent

 *			devices.

 * @priv:		[OPTIONAL] pointer to private chip data

 * @errstat:		[OPTIONAL] hardware specific function to perform

 *			additional error status checks (determine if errors are

 *			correctable).

 * @manufacturer:	[INTERN] Contains manufacturer information

 */
@@ -860,8 +857,6 @@ struct nand_chip { 
	int(*waitfunc)(struct mtd_info *mtd, struct nand_chip *this);

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

	int (*scan_bbt)(struct mtd_info *mtd);

	int (*errstat)(struct mtd_info *mtd, struct nand_chip *this, int state,

			int status, int page);

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

			int feature_addr, uint8_t *subfeature_para);

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