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

mtd: rawnand: Get rid of the ->read_word() hook 



Commit c120e75e ("mtd: nand: use read_oob() instead of cmdfunc()
for bad block check") removed this only user of the ->read_word()
method but kept the hook in place. Remove it now.

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

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

+0 −9
Original line number Diff line number Diff line
@@ -418,14 +418,6 @@ static u8 atmel_nand_read_byte(struct mtd_info *mtd) 
	return ioread8(nand->activecs->io.virt);

}



static u16 atmel_nand_read_word(struct mtd_info *mtd)

{

	struct nand_chip *chip = mtd_to_nand(mtd);

	struct atmel_nand *nand = to_atmel_nand(chip);



	return ioread16(nand->activecs->io.virt);

}



static void atmel_nand_write_byte(struct mtd_info *mtd, u8 byte)

{

	struct nand_chip *chip = mtd_to_nand(mtd);
@@ -1500,7 +1492,6 @@ static void atmel_nand_init(struct atmel_nand_controller *nc, 


	chip->cmd_ctrl = atmel_nand_cmd_ctrl;

	chip->read_byte = atmel_nand_read_byte;

	chip->read_word = atmel_nand_read_word;

	chip->write_byte = atmel_nand_write_byte;

	chip->read_buf = atmel_nand_read_buf;

	chip->write_buf = atmel_nand_write_buf;

drivers/mtd/nand/raw/au1550nd.c

+0 −15
Original line number Diff line number Diff line
@@ -83,20 +83,6 @@ static void au_write_byte16(struct mtd_info *mtd, u_char byte) 
	wmb(); /* drain writebuffer */

}



/**

 * au_read_word -  read one word from the chip

 * @mtd:	MTD device structure

 *

 * read function for 16bit buswidth without endianness conversion

 */

static u16 au_read_word(struct mtd_info *mtd)

{

	struct nand_chip *this = mtd_to_nand(mtd);

	u16 ret = readw(this->IO_ADDR_R);

	wmb(); /* drain writebuffer */

	return ret;

}



/**

 * au_write_buf -  write buffer to chip

 * @mtd:	MTD device structure
@@ -462,7 +448,6 @@ static int au1550nd_probe(struct platform_device *pdev) 


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

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

	this->read_word = au_read_word;

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

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

drivers/mtd/nand/raw/denali.c

+0 −10
Original line number Diff line number Diff line
@@ -279,15 +279,6 @@ static void denali_write_byte(struct mtd_info *mtd, uint8_t byte) 
	denali_write_buf(mtd, &byte, 1);

}



static uint16_t denali_read_word(struct mtd_info *mtd)

{

	uint16_t word;



	denali_read_buf16(mtd, (uint8_t *)&word, 2);



	return word;

}



static void denali_cmd_ctrl(struct mtd_info *mtd, int dat, unsigned int ctrl)

{

	struct denali_nand_info *denali = mtd_to_denali(mtd);
@@ -1354,7 +1345,6 @@ int denali_init(struct denali_nand_info *denali) 
	chip->select_chip = denali_select_chip;

	chip->read_byte = denali_read_byte;

	chip->write_byte = denali_write_byte;

	chip->read_word = denali_read_word;

	chip->cmd_ctrl = denali_cmd_ctrl;

	chip->dev_ready = denali_dev_ready;

	chip->waitfunc = denali_waitfunc;

drivers/mtd/nand/raw/hisi504_nand.c

+0 −10
Original line number Diff line number Diff line
@@ -380,15 +380,6 @@ static uint8_t hisi_nfc_read_byte(struct mtd_info *mtd) 
	return *(uint8_t *)(host->buffer + host->offset - 1);

}



static u16 hisi_nfc_read_word(struct mtd_info *mtd)

{

	struct nand_chip *chip = mtd_to_nand(mtd);

	struct hinfc_host *host = nand_get_controller_data(chip);



	host->offset += 2;

	return *(u16 *)(host->buffer + host->offset - 2);

}



static void

hisi_nfc_write_buf(struct mtd_info *mtd, const uint8_t *buf, int len)

{
@@ -795,7 +786,6 @@ static int hisi_nfc_probe(struct platform_device *pdev) 
	chip->cmdfunc		= hisi_nfc_cmdfunc;

	chip->select_chip	= hisi_nfc_select_chip;

	chip->read_byte		= hisi_nfc_read_byte;

	chip->read_word		= hisi_nfc_read_word;

	chip->write_buf		= hisi_nfc_write_buf;

	chip->read_buf		= hisi_nfc_read_buf;

	chip->chip_delay	= HINFC504_CHIP_DELAY;

drivers/mtd/nand/raw/mpc5121_nfc.c

+0 −11
Original line number Diff line number Diff line
@@ -515,16 +515,6 @@ static u8 mpc5121_nfc_read_byte(struct mtd_info *mtd) 
	return tmp;

}



/* Read word from NFC buffers */

static u16 mpc5121_nfc_read_word(struct mtd_info *mtd)

{

	u16 tmp;



	mpc5121_nfc_read_buf(mtd, (u_char *)&tmp, sizeof(tmp));



	return tmp;

}



/*

 * Read NFC configuration from Reset Config Word

 *
@@ -703,7 +693,6 @@ static int mpc5121_nfc_probe(struct platform_device *op) 
	chip->dev_ready = mpc5121_nfc_dev_ready;

	chip->cmdfunc = mpc5121_nfc_command;

	chip->read_byte = mpc5121_nfc_read_byte;

	chip->read_word = mpc5121_nfc_read_word;

	chip->read_buf = mpc5121_nfc_read_buf;

	chip->write_buf = mpc5121_nfc_write_buf;

	chip->select_chip = mpc5121_nfc_select_chip;

CRA Git | Maintained and supported by SUSTech CRA and CCSE