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

Commit f107d7a4 authored by Boris Brezillon's avatar Boris Brezillon
Browse files

mtd: nand: Remove unused chip->write_page() hook 



The last/only user of the chip->write_page() hook (the Atmel NAND
controller driver) has been reworked and is no longer specifying a custom
->write_page() implementation.
Drop this hook before someone else start abusing it.

Signed-off-by: default avatarBoris Brezillon <boris.brezillon@free-electrons.com>
Reviewed-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
parent 82d0bf34

drivers/mtd/nand/nand_base.c

+5 −7
Original line number Diff line number Diff line
@@ -2633,7 +2633,7 @@ static int nand_write_page_syndrome(struct mtd_info *mtd, 
}



/**

 * nand_write_page - [REPLACEABLE] write one page

 * nand_write_page - write one page

 * @mtd: MTD device structure

 * @chip: NAND chip descriptor

 * @offset: address offset within the page
@@ -2836,7 +2836,8 @@ static int nand_do_write_ops(struct mtd_info *mtd, loff_t to, 
			/* We still need to erase leftover OOB data */

			memset(chip->oob_poi, 0xff, mtd->oobsize);

		}

		ret = chip->write_page(mtd, chip, column, bytes, wbuf,



		ret = nand_write_page(mtd, chip, column, bytes, wbuf,

				      oob_required, page, cached,

				      (ops->mode == MTD_OPS_RAW));

		if (ret)
@@ -4548,9 +4549,6 @@ int nand_scan_tail(struct mtd_info *mtd) 
		}

	}



	if (!chip->write_page)

		chip->write_page = nand_write_page;



	/*

	 * Check ECC mode, default to software if 3byte/512byte hardware ECC is

	 * selected and we have 256 byte pagesize fallback to software ECC

include/linux/mtd/nand.h

+0 −4
Original line number Diff line number Diff line
@@ -828,7 +828,6 @@ struct nand_manufacturer_ops { 
 * @errstat:		[OPTIONAL] hardware specific function to perform

 *			additional error status checks (determine if errors are

 *			correctable).

 * @write_page:		[REPLACEABLE] High-level page write function

 * @manufacturer:	[INTERN] Contains manufacturer information

 */
@@ -854,9 +853,6 @@ struct nand_chip { 
	int (*scan_bbt)(struct mtd_info *mtd);

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

			int status, int page);

	int (*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 (*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,