Commit cad74f2c authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

[MTD] NAND remove write_byte/word function from nand_chip 



The previous change of the command / hardware control allows to
remove the write_byte/word functions completely, as their only
user were nand_command and nand_command_lp.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 7abd3ef9

drivers/mtd/nand/ams-delta.c

+0 −1
Original line number Diff line number Diff line
@@ -179,7 +179,6 @@ static int __init ams_delta_init(void) 
	this->IO_ADDR_R = (OMAP_MPUIO_BASE + OMAP_MPUIO_INPUT_LATCH);

	this->IO_ADDR_W = (OMAP_MPUIO_BASE + OMAP_MPUIO_OUTPUT);

	this->read_byte = ams_delta_read_byte;

	this->write_byte = ams_delta_write_byte;

	this->write_buf = ams_delta_write_buf;

	this->read_buf = ams_delta_read_buf;

	this->verify_buf = ams_delta_verify_buf;

drivers/mtd/nand/au1550nd.c

+8 −23
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ 
static struct mtd_info *au1550_mtd = NULL;

static void __iomem *p_nand;

static int nand_width = 1;	/* default x8 */

static void (*au1550_write_byte)(struct mtd_info *, u_char);



/*

 * Define partitions for flash device
@@ -128,21 +129,6 @@ static u16 au_read_word(struct mtd_info *mtd) 
	return ret;

}



/**

 * au_write_word -  write one word to the chip

 * @mtd:	MTD device structure

 * @word:	data word to write

 *

 *  write function for 16bit buswith without

 * endianess conversion

 */

static void au_write_word(struct mtd_info *mtd, u16 word)

{

	struct nand_chip *this = mtd->priv;

	writew(word, this->IO_ADDR_W);

	au_sync();

}



/**

 * au_write_buf -  write buffer to chip

 * @mtd:	MTD device structure
@@ -379,9 +365,9 @@ static void au1550_command(struct mtd_info *mtd, unsigned command, int column, i 
			column -= 256;

			readcmd = NAND_CMD_READ1;

		}

		this->write_byte(mtd, readcmd);

		au1550_write_byte(mtd, readcmd);

	}

	this->write_byte(mtd, command);

	au1550_write_byte(mtd, command);



	/* Set ALE and clear CLE to start address cycle */

	au1550_hwcontrol(mtd, NAND_CTL_CLRCLE);
@@ -394,10 +380,10 @@ static void au1550_command(struct mtd_info *mtd, unsigned command, int column, i 
			/* Adjust columns for 16 bit buswidth */

			if (this->options & NAND_BUSWIDTH_16)

				column >>= 1;

			this->write_byte(mtd, column);

			au1550_write_byte(mtd, column);

		}

		if (page_addr != -1) {

			this->write_byte(mtd, (u8)(page_addr & 0xff));

			au1550_write_byte(mtd, (u8)(page_addr & 0xff));



			if (command == NAND_CMD_READ0 ||

			    command == NAND_CMD_READ1 ||
@@ -415,11 +401,11 @@ static void au1550_command(struct mtd_info *mtd, unsigned command, int column, i 
				au1550_hwcontrol(mtd, NAND_CTL_SETNCE);

			}



			this->write_byte(mtd, (u8)(page_addr >> 8));

			au1550_write_byte(mtd, (u8)(page_addr >> 8));



			/* One more address cycle for devices > 32MiB */

			if (this->chipsize > (32 << 20))

				this->write_byte(mtd, (u8)((page_addr >> 16) & 0x0f));

				au1550_write_byte(mtd, (u8)((page_addr >> 16) & 0x0f));

		}

		/* Latch in address */

		au1550_hwcontrol(mtd, NAND_CTL_CLRALE);
@@ -597,8 +583,7 @@ static int __init au1xxx_nand_init(void) 
		this->options |= NAND_BUSWIDTH_16;



	this->read_byte = (!nand_width) ? au_read_byte16 : au_read_byte;

	this->write_byte = (!nand_width) ? au_write_byte16 : au_write_byte;

	this->write_word = au_write_word;

	au1550_write_byte = (!nand_width) ? au_write_byte16 : au_write_byte;

	this->read_word = au_read_word;

	this->write_buf = (!nand_width) ? au_write_buf16 : au_write_buf;

	this->read_buf = (!nand_width) ? au_read_buf16 : au_read_buf;

drivers/mtd/nand/cs553x_nand.c

+0 −1
Original line number Diff line number Diff line
@@ -220,7 +220,6 @@ static int __init cs553x_init_one(int cs, int mmio, unsigned long adr) 
	this->cmd_ctrl = cs553x_hwcontrol;

	this->dev_ready = cs553x_device_ready;

	this->read_byte = cs553x_read_byte;

	this->write_byte = cs553x_write_byte;

	this->read_buf = cs553x_read_buf;

	this->write_buf = cs553x_write_buf;

drivers/mtd/nand/diskonchip.c

+6 −5
Original line number Diff line number Diff line
@@ -717,8 +717,12 @@ static void doc200x_hwcontrol(struct mtd_info *mtd, int cmd, 
		/* 11.4.3 -- 4 NOPs after CSDNControl write */

		DoC_Delay(doc, 4);

	}

	if (cmd != NAND_CMD_NONE)

		this->write_byte(mtd, cmd);

	if (cmd != NAND_CMD_NONE) {

		if (DoC_is_2000(doc))

			doc2000_write_byte(mtd, cmd);

		else

			doc2001_write_byte(mtd, cmd);

	}

}



static void doc2001plus_command(struct mtd_info *mtd, unsigned command, int column, int page_addr)
@@ -1435,7 +1439,6 @@ static inline int __init doc2000_init(struct mtd_info *mtd) 
	struct nand_chip *this = mtd->priv;

	struct doc_priv *doc = this->priv;



	this->write_byte = doc2000_write_byte;

	this->read_byte = doc2000_read_byte;

	this->write_buf = doc2000_writebuf;

	this->read_buf = doc2000_readbuf;
@@ -1453,7 +1456,6 @@ static inline int __init doc2001_init(struct mtd_info *mtd) 
	struct nand_chip *this = mtd->priv;

	struct doc_priv *doc = this->priv;



	this->write_byte = doc2001_write_byte;

	this->read_byte = doc2001_read_byte;

	this->write_buf = doc2001_writebuf;

	this->read_buf = doc2001_readbuf;
@@ -1485,7 +1487,6 @@ static inline int __init doc2001plus_init(struct mtd_info *mtd) 
	struct nand_chip *this = mtd->priv;

	struct doc_priv *doc = this->priv;



	this->write_byte = NULL;

	this->read_byte = doc2001plus_read_byte;

	this->write_buf = doc2001plus_writebuf;

	this->read_buf = doc2001plus_readbuf;

drivers/mtd/nand/nand_base.c

+0 −45
Original line number Diff line number Diff line
@@ -197,19 +197,6 @@ static uint8_t nand_read_byte(struct mtd_info *mtd) 
	return readb(this->IO_ADDR_R);

}



/**

 * nand_write_byte - [DEFAULT] write one byte to the chip

 * @mtd:	MTD device structure

 * @byte:	pointer to data byte to write

 *

 * Default write function for 8it buswith

 */

static void nand_write_byte(struct mtd_info *mtd, uint8_t byte)

{

	struct nand_chip *this = mtd->priv;

	writeb(byte, this->IO_ADDR_W);

}



/**

 * nand_read_byte16 - [DEFAULT] read one byte endianess aware from the chip

 * @mtd:	MTD device structure
@@ -223,20 +210,6 @@ static uint8_t nand_read_byte16(struct mtd_info *mtd) 
	return (uint8_t) cpu_to_le16(readw(this->IO_ADDR_R));

}



/**

 * nand_write_byte16 - [DEFAULT] write one byte endianess aware to the chip

 * @mtd:	MTD device structure

 * @byte:	pointer to data byte to write

 *

 * Default write function for 16bit buswith with

 * endianess conversion

 */

static void nand_write_byte16(struct mtd_info *mtd, uint8_t byte)

{

	struct nand_chip *this = mtd->priv;

	writew(le16_to_cpu((u16) byte), this->IO_ADDR_W);

}



/**

 * nand_read_word - [DEFAULT] read one word from the chip

 * @mtd:	MTD device structure
@@ -250,20 +223,6 @@ static u16 nand_read_word(struct mtd_info *mtd) 
	return readw(this->IO_ADDR_R);

}



/**

 * nand_write_word - [DEFAULT] write one word to the chip

 * @mtd:	MTD device structure

 * @word:	data word to write

 *

 * Default write function for 16bit buswith without

 * endianess conversion

 */

static void nand_write_word(struct mtd_info *mtd, u16 word)

{

	struct nand_chip *this = mtd->priv;

	writew(word, this->IO_ADDR_W);

}



/**

 * nand_select_chip - [DEFAULT] control CE line

 * @mtd:	MTD device structure
@@ -2200,12 +2159,8 @@ static void nand_set_defaults(struct nand_chip *this, int busw) 


	if (!this->select_chip)

		this->select_chip = nand_select_chip;

	if (!this->write_byte)

		this->write_byte = busw ? nand_write_byte16 : nand_write_byte;

	if (!this->read_byte)

		this->read_byte = busw ? nand_read_byte16 : nand_read_byte;

	if (!this->write_word)

		this->write_word = nand_write_word;

	if (!this->read_word)

		this->read_word = nand_read_word;

	if (!this->block_bad)