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

mtd: rawnand: Deprecate ->{read, write}_{byte, buf}() hooks 



All those hooks have been replaced by ->exec_op(). Move them to the
nand_legacy struct.

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

drivers/mtd/nand/raw/ams-delta.c

+3 −3
Original line number Diff line number Diff line
@@ -210,9 +210,9 @@ static int ams_delta_init(struct platform_device *pdev) 
	/* Set address of NAND IO lines */

	this->legacy.IO_ADDR_R = io_base + OMAP_MPUIO_INPUT_LATCH;

	this->legacy.IO_ADDR_W = io_base + OMAP_MPUIO_OUTPUT;

	this->read_byte = ams_delta_read_byte;

	this->write_buf = ams_delta_write_buf;

	this->read_buf = ams_delta_read_buf;

	this->legacy.read_byte = ams_delta_read_byte;

	this->legacy.write_buf = ams_delta_write_buf;

	this->legacy.read_buf = ams_delta_read_buf;

	this->cmd_ctrl = ams_delta_hwcontrol;

	if (gpio_request(AMS_DELTA_GPIO_PIN_NAND_RB, "nand_rdy") == 0) {

		this->dev_ready = ams_delta_nand_ready;

drivers/mtd/nand/raw/atmel/nand-controller.c

+4 −4
Original line number Diff line number Diff line
@@ -1473,10 +1473,10 @@ static void atmel_nand_init(struct atmel_nand_controller *nc, 
	nand->base.controller = &nc->base;



	chip->cmd_ctrl = atmel_nand_cmd_ctrl;

	chip->read_byte = atmel_nand_read_byte;

	chip->write_byte = atmel_nand_write_byte;

	chip->read_buf = atmel_nand_read_buf;

	chip->write_buf = atmel_nand_write_buf;

	chip->legacy.read_byte = atmel_nand_read_byte;

	chip->legacy.write_byte = atmel_nand_write_byte;

	chip->legacy.read_buf = atmel_nand_read_buf;

	chip->legacy.write_buf = atmel_nand_write_buf;

	chip->select_chip = atmel_nand_select_chip;



	if (nc->mck && nc->caps->ops->setup_data_interface)

drivers/mtd/nand/raw/au1550nd.c

+3 −3
Original line number Diff line number Diff line
@@ -440,10 +440,10 @@ static int au1550nd_probe(struct platform_device *pdev) 
	if (pd->devwidth)

		this->options |= NAND_BUSWIDTH_16;



	this->read_byte = (pd->devwidth) ? au_read_byte16 : au_read_byte;

	this->legacy.read_byte = (pd->devwidth) ? au_read_byte16 : au_read_byte;

	ctx->write_byte = (pd->devwidth) ? au_write_byte16 : au_write_byte;

	this->write_buf = (pd->devwidth) ? au_write_buf16 : au_write_buf;

	this->read_buf = (pd->devwidth) ? au_read_buf16 : au_read_buf;

	this->legacy.write_buf = (pd->devwidth) ? au_write_buf16 : au_write_buf;

	this->legacy.read_buf = (pd->devwidth) ? au_read_buf16 : au_read_buf;



	ret = nand_scan(this, 1);

	if (ret) {

drivers/mtd/nand/raw/bcm47xxnflash/ops_bcm4706.c

+3 −3
Original line number Diff line number Diff line
@@ -387,9 +387,9 @@ int bcm47xxnflash_ops_bcm4706_init(struct bcm47xxnflash *b47n) 
	nand_chip->cmd_ctrl = bcm47xxnflash_ops_bcm4706_cmd_ctrl;

	nand_chip->dev_ready = bcm47xxnflash_ops_bcm4706_dev_ready;

	b47n->nand_chip.cmdfunc = bcm47xxnflash_ops_bcm4706_cmdfunc;

	b47n->nand_chip.read_byte = bcm47xxnflash_ops_bcm4706_read_byte;

	b47n->nand_chip.read_buf = bcm47xxnflash_ops_bcm4706_read_buf;

	b47n->nand_chip.write_buf = bcm47xxnflash_ops_bcm4706_write_buf;

	b47n->nand_chip.legacy.read_byte = bcm47xxnflash_ops_bcm4706_read_byte;

	b47n->nand_chip.legacy.read_buf = bcm47xxnflash_ops_bcm4706_read_buf;

	b47n->nand_chip.legacy.write_buf = bcm47xxnflash_ops_bcm4706_write_buf;

	b47n->nand_chip.set_features = nand_get_set_features_notsupp;

	b47n->nand_chip.get_features = nand_get_set_features_notsupp;

drivers/mtd/nand/raw/brcmnand/brcmnand.c

+3 −3
Original line number Diff line number Diff line
@@ -2273,9 +2273,9 @@ static int brcmnand_init_cs(struct brcmnand_host *host, struct device_node *dn) 
	chip->cmd_ctrl = brcmnand_cmd_ctrl;

	chip->cmdfunc = brcmnand_cmdfunc;

	chip->waitfunc = brcmnand_waitfunc;

	chip->read_byte = brcmnand_read_byte;

	chip->read_buf = brcmnand_read_buf;

	chip->write_buf = brcmnand_write_buf;

	chip->legacy.read_byte = brcmnand_read_byte;

	chip->legacy.read_buf = brcmnand_read_buf;

	chip->legacy.write_buf = brcmnand_write_buf;



	chip->ecc.mode = NAND_ECC_HW;

	chip->ecc.read_page = brcmnand_read_page;

CRA Git | Maintained and supported by SUSTech CRA and CCSE