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

mtd: rawnand: Deprecate ->cmd_ctrl() and ->cmdfunc() 



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 716bbbab

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

+1 −1
Original line number Diff line number Diff line
@@ -213,7 +213,7 @@ static int ams_delta_init(struct platform_device *pdev) 
	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;

	this->legacy.cmd_ctrl = ams_delta_hwcontrol;

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

		this->dev_ready = ams_delta_nand_ready;

	} else {

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

+2 −2
Original line number Diff line number Diff line
@@ -1472,7 +1472,7 @@ static void atmel_nand_init(struct atmel_nand_controller *nc, 
	mtd->dev.parent = nc->dev;

	nand->base.controller = &nc->base;



	chip->cmd_ctrl = atmel_nand_cmd_ctrl;

	chip->legacy.cmd_ctrl = atmel_nand_cmd_ctrl;

	chip->legacy.read_byte = atmel_nand_read_byte;

	chip->legacy.write_byte = atmel_nand_write_byte;

	chip->legacy.read_buf = atmel_nand_read_buf;
@@ -1524,7 +1524,7 @@ static void atmel_hsmc_nand_init(struct atmel_nand_controller *nc, 
	atmel_nand_init(nc, nand);



	/* Overload some methods for the HSMC controller. */

	chip->cmd_ctrl = atmel_hsmc_nand_cmd_ctrl;

	chip->legacy.cmd_ctrl = atmel_hsmc_nand_cmd_ctrl;

	chip->select_chip = atmel_hsmc_nand_select_chip;

}

drivers/mtd/nand/raw/au1550nd.c

+1 −1
Original line number Diff line number Diff line
@@ -430,7 +430,7 @@ static int au1550nd_probe(struct platform_device *pdev) 


	this->dev_ready = au1550_device_ready;

	this->select_chip = au1550_select_chip;

	this->cmdfunc = au1550_command;

	this->legacy.cmdfunc = au1550_command;



	/* 30 us command delay time */

	this->chip_delay = 30;

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

+3 −3
Original line number Diff line number Diff line
@@ -227,7 +227,7 @@ static void bcm47xxnflash_ops_bcm4706_cmdfunc(struct nand_chip *nand_chip, 


	switch (command) {

	case NAND_CMD_RESET:

		nand_chip->cmd_ctrl(nand_chip, command, NAND_CTRL_CLE);

		nand_chip->legacy.cmd_ctrl(nand_chip, command, NAND_CTRL_CLE);



		ndelay(100);

		nand_wait_ready(nand_chip);
@@ -384,9 +384,9 @@ int bcm47xxnflash_ops_bcm4706_init(struct bcm47xxnflash *b47n) 
	u32 val;



	b47n->nand_chip.select_chip = bcm47xxnflash_ops_bcm4706_select_chip;

	nand_chip->cmd_ctrl = bcm47xxnflash_ops_bcm4706_cmd_ctrl;

	nand_chip->legacy.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.legacy.cmdfunc = bcm47xxnflash_ops_bcm4706_cmdfunc;

	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;

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

+2 −2
Original line number Diff line number Diff line
@@ -2270,8 +2270,8 @@ static int brcmnand_init_cs(struct brcmnand_host *host, struct device_node *dn) 
	mtd->owner = THIS_MODULE;

	mtd->dev.parent = &pdev->dev;



	chip->cmd_ctrl = brcmnand_cmd_ctrl;

	chip->cmdfunc = brcmnand_cmdfunc;

	chip->legacy.cmd_ctrl = brcmnand_cmd_ctrl;

	chip->legacy.cmdfunc = brcmnand_cmdfunc;

	chip->waitfunc = brcmnand_waitfunc;

	chip->legacy.read_byte = brcmnand_read_byte;

	chip->legacy.read_buf = brcmnand_read_buf;

CRA Git | Maintained and supported by SUSTech CRA and CCSE