Commit a7f5ba40 authored by Boris BREZILLON's avatar Boris BREZILLON Committed by Brian Norris
Browse files

mtd: nand: remove unused ->init_size() hook 



The ->init_size() hook was introduced to let NAND controller drivers
support NAND devices that could not be described in the nand_ids table.
Since then, the core has added support for extended-id parsing and
full-id description, thus allowing to describe pretty much all existing
NANDs.
Moreover, this hook is not used by any mainline driver, and should not be
used by new drivers, because detecting the NAND chip is not something
controller specific.

Signed-off-by: default avatarBoris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: default avatarBrian Norris <computersforpeace@gmail.com>
parent 99a3b155

drivers/mtd/nand/nand_base.c

+1 −4
Original line number Diff line number Diff line
@@ -3836,10 +3836,7 @@ static struct nand_flash_dev *nand_get_flash_type(struct mtd_info *mtd, 


	chip->chipsize = (uint64_t)type->chipsize << 20;



	if (!type->pagesize && chip->init_size) {

		/* Set the pagesize, oobsize, erasesize by the driver */

		busw = chip->init_size(mtd, chip, id_data);

	} else if (!type->pagesize) {

	if (!type->pagesize) {

		/* Decode parameters from extended ID */

		nand_decode_ext_id(mtd, chip, id_data, &busw);

	} else {

include/linux/mtd/nand.h

+0 −6
Original line number Diff line number Diff line
@@ -556,10 +556,6 @@ struct nand_buffers { 
 * @block_markbad:	[REPLACEABLE] mark a block bad

 * @cmd_ctrl:		[BOARDSPECIFIC] hardwarespecific function for controlling

 *			ALE/CLE/nCE. Also used to write command and address

 * @init_size:		[BOARDSPECIFIC] hardwarespecific function for setting

 *			mtd->oobsize, mtd->writesize and so on.

 *			@id_data contains the 8 bytes values of NAND_CMD_READID.

 *			Return with the bus width.

 * @dev_ready:		[BOARDSPECIFIC] hardwarespecific function for accessing

 *			device ready/busy line. If set to NULL no access to

 *			ready/busy is available and the ready/busy information
@@ -658,8 +654,6 @@ struct nand_chip { 
	int (*block_bad)(struct mtd_info *mtd, loff_t ofs, int getchip);

	int (*block_markbad)(struct mtd_info *mtd, loff_t ofs);

	void (*cmd_ctrl)(struct mtd_info *mtd, int dat, unsigned int ctrl);

	int (*init_size)(struct mtd_info *mtd, struct nand_chip *this,

			u8 *id_data);

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

	void (*cmdfunc)(struct mtd_info *mtd, unsigned command, int column,

			int page_addr);

CRA Git | Maintained and supported by SUSTech CRA and CCSE